summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-02-10 11:50:59 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-02-10 11:50:59 -0500
commitdbd456f5965d857731958460c975318d1ddc9866 (patch)
tree8685c56ad4fe5d0b68ae6aa6e0c8253d49904be1 /roles
parent9c339b580e81eee7b9a4e7707b72176336732b98 (diff)
parentb398b37e82e413f2eed88e272f615d396ab8904c (diff)
downloadopenshift-dbd456f5965d857731958460c975318d1ddc9866.tar.gz
openshift-dbd456f5965d857731958460c975318d1ddc9866.tar.bz2
openshift-dbd456f5965d857731958460c975318d1ddc9866.tar.xz
openshift-dbd456f5965d857731958460c975318d1ddc9866.zip
Merge pull request #1371 from abutcher/mask-atomic
Don't mask master service on atomic.
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_master/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 3f7701519..3613808b6 100644
--- a/roles/openshift_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -287,7 +287,7 @@
- name: Mask master service
command: systemctl mask {{ openshift.common.service_type }}-master
- when: openshift_master_ha | bool and openshift.master.cluster_method == 'native'
+ when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' and not openshift.common.is_atomic | bool
- name: Start and enable master api
service: name={{ openshift.common.service_type }}-master-api enabled=yes state=started