From cb0fc3000447b6305491fe24d28d4b8574e4acac Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Mon, 28 Mar 2016 14:38:33 -0400 Subject: Use openshift.master.ha instead of duplicating the logic --- playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.yml | 3 --- 1 file changed, 3 deletions(-) (limited to 'playbooks/common/openshift-cluster/upgrades/v3_1_to_v3_2/upgrade.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}} -- cgit v1.2.3