summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-14 16:49:06 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-14 17:08:15 -0400
commita7efbbb35c77213d9805ffc7354e3bd31078f38b (patch)
tree892a6d9e05bfb942b9b7eb74febaedee050ec53b /playbooks/common
parentf35b13f6a01f4c5bb1b30a1a82b0f7819cef047d (diff)
downloadopenshift-a7efbbb35c77213d9805ffc7354e3bd31078f38b.tar.gz
openshift-a7efbbb35c77213d9805ffc7354e3bd31078f38b.tar.bz2
openshift-a7efbbb35c77213d9805ffc7354e3bd31078f38b.tar.xz
openshift-a7efbbb35c77213d9805ffc7354e3bd31078f38b.zip
Handle HA master case
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml19
1 files changed, 17 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
index c5fff8c3a..668a80996 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml
@@ -24,7 +24,6 @@
- name: Verify upgrade can proceed
hosts: oo_first_master
vars:
- openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}"
target_version: "{{ '1.2' if deployment_type == 'origin' else '3.1.1.900' }}"
gather_facts: no
tasks:
@@ -48,13 +47,29 @@
- name: Verify upgrade can proceed
hosts: oo_masters_to_config
+ vars:
+ openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}"
tasks:
- name: Ensure Master is running
service:
name: "{{ openshift.common.service_type }}-master"
state: started
enabled: yes
- when: openshift.common.is_containerized | bool
+ when: 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 | bool and 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 | bool and openshift.common.is_containerized | bool
- name: Verify upgrade can proceed
hosts: oo_nodes_to_config