diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-08 12:50:25 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-08 12:50:25 -0500 |
| commit | 8a94529e344b0debf9f9957640d9d449a5438400 (patch) | |
| tree | ffc37090d9aad6e9f814c565e04244c8e28c769f | |
| parent | 119bba8c06fe34b8ae4102cab529a74452dbf85c (diff) | |
| download | openshift-8a94529e344b0debf9f9957640d9d449a5438400.tar.gz openshift-8a94529e344b0debf9f9957640d9d449a5438400.tar.bz2 openshift-8a94529e344b0debf9f9957640d9d449a5438400.tar.xz openshift-8a94529e344b0debf9f9957640d9d449a5438400.zip | |
Fix preupgrade authorization objects are in sync minor versions
Currently, we check that upgrade target is less than 3.8,
but this will break for minor upgrades.
This commit set's a fact early in the upgrade process to
deterime what the currently installed version on the
first master is.
This fact is used to determine if our currently installed
version is less than 3.7.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508301
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/init.yml | 5 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml index 2826951e6..6ad0b6b86 100644 --- a/playbooks/common/openshift-cluster/upgrades/init.yml +++ b/playbooks/common/openshift-cluster/upgrades/init.yml @@ -9,7 +9,12 @@ - name: Ensure firewall is not switched during upgrade hosts: oo_all_hosts + vars: + openshift_master_installed_version: "{{ hostvars[groups.oo_first_master.0].openshift.common.version }}" tasks: + - name: set currently installed version + set_fact: + openshift_currently_installed_version: "{{ openshift_master_installed_version }}" - name: Check if iptables is running command: systemctl status iptables changed_when: false diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml index 022b4b4fb..7a28eeb27 100644 --- a/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml +++ b/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml @@ -15,7 +15,7 @@ - name: Confirm OpenShift authorization objects are in sync command: > {{ openshift.common.client_binary }} adm migrate authorization - when: openshift_upgrade_target | version_compare('3.8','<') + when: openshift_currently_installed_version | version_compare('3.7','<') changed_when: false register: l_oc_result until: l_oc_result.rc == 0 |