diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-28 14:38:33 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-29 09:52:01 -0400 |
| commit | cb0fc3000447b6305491fe24d28d4b8574e4acac (patch) | |
| tree | 30bf65f1cfb6dacb943b774be864d4cede0f0d4d /playbooks/common/openshift-cluster | |
| parent | d4da502b9f332a6e4ec5a3b757dd8bf352990ec8 (diff) | |
| download | openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.tar.gz openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.tar.bz2 openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.tar.xz openshift-cb0fc3000447b6305491fe24d28d4b8574e4acac.zip | |
Use openshift.master.ha instead of duplicating the logic
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/pre.yml | 9 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 3 |
2 files changed, 3 insertions, 9 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 9443a2317..d491575f8 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 @@ -49,29 +49,27 @@ hosts: oo_masters_to_config roles: - openshift_facts - 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: not openshift_master_ha | bool and openshift.common.is_containerized | bool + 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 | bool and openshift.common.is_containerized | bool + when: openshift.master.ha is defined and 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 + when: openshift.master.ha is defined and openshift.master.ha | bool and openshift.common.is_containerized | bool - name: Verify upgrade can proceed hosts: oo_nodes_to_config @@ -89,7 +87,6 @@ hosts: oo_masters_to_config:oo_nodes_to_config vars: target_version: "{{ '1.2' if deployment_type == 'origin' else '3.1.1.900' }}" - openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" handlers: - include: ../../../../../roles/openshift_master/handlers/main.yml - include: ../../../../../roles/openshift_node/handlers/main.yml diff --git a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml index e6d7ae05b..481d8e67a 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml @@ -45,8 +45,6 @@ ############################################################################### - name: Upgrade master hosts: oo_masters_to_config - vars: - openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" handlers: - include: ../../../../../roles/openshift_master/handlers/main.yml roles: @@ -145,7 +143,6 @@ vars: origin_reconcile_bindings: "{{ deployment_type == 'origin' and g_new_version | version_compare('1.0.6', '>') }}" ent_reconcile_bindings: true - openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" tasks: - name: Verifying the correct commandline tools are available shell: grep {{ verify_upgrade_version }} {{ openshift.common.admin_binary}} |