summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorClayton Coleman <ccoleman@redhat.com>2017-07-22 14:08:10 -0400
committerClayton Coleman <ccoleman@redhat.com>2017-08-08 12:50:22 -0400
commit1f527e2f2dbf1508ab249589680a3f9f5a8d4966 (patch)
treeba9c065037272f2d5691dc71a63707ff11f4b0a8 /playbooks/common/openshift-cluster
parent8da86f5c6842da6bed009f76e3f63e81e9e52c99 (diff)
downloadopenshift-1f527e2f2dbf1508ab249589680a3f9f5a8d4966.tar.gz
openshift-1f527e2f2dbf1508ab249589680a3f9f5a8d4966.tar.bz2
openshift-1f527e2f2dbf1508ab249589680a3f9f5a8d4966.tar.xz
openshift-1f527e2f2dbf1508ab249589680a3f9f5a8d4966.zip
Remove the origin-master.service and associated files
From now on, all master configurations use the api / controller split, regardless of HA mode or previous configuration. This will be our only supported configuration starting in 3.7 or 3.8.
Diffstat (limited to 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/pre/verify_control_plane_running.yml11
1 files changed, 2 insertions, 9 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/verify_control_plane_running.yml b/playbooks/common/openshift-cluster/upgrades/pre/verify_control_plane_running.yml
index 06eb5f936..45022cd61 100644
--- a/playbooks/common/openshift-cluster/upgrades/pre/verify_control_plane_running.yml
+++ b/playbooks/common/openshift-cluster/upgrades/pre/verify_control_plane_running.yml
@@ -9,23 +9,16 @@
local_facts:
ha: "{{ groups.oo_masters_to_config | length > 1 }}"
- - name: Ensure Master is running
- service:
- name: "{{ openshift.common.service_type }}-master"
- state: started
- enabled: yes
- when: openshift.master.ha is defined and not openshift.master.ha | bool and openshift.common.is_containerized | bool
-
- name: Ensure HA Master is running
service:
name: "{{ openshift.common.service_type }}-master-api"
state: started
enabled: yes
- when: openshift.master.ha is defined and openshift.master.ha | bool and openshift.common.is_containerized | bool
+ when: openshift.common.is_containerized | bool
- name: Ensure HA Master is running
service:
name: "{{ openshift.common.service_type }}-master-controllers"
state: started
enabled: yes
- when: openshift.master.ha is defined and openshift.master.ha | bool and openshift.common.is_containerized | bool
+ when: openshift.common.is_containerized | bool