diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-08 15:09:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-08 15:09:12 -0500 |
| commit | 4c80a74d3c8e0ed8a164cf805d88285e265be790 (patch) | |
| tree | 823dcd66ccb32763b8c663e2f52c8a3247a5e3f8 | |
| parent | a8ec851e922297dc1dcf318e0c22ba22f525df7a (diff) | |
| parent | 8a94529e344b0debf9f9957640d9d449a5438400 (diff) | |
| download | openshift-4c80a74d3c8e0ed8a164cf805d88285e265be790.tar.gz openshift-4c80a74d3c8e0ed8a164cf805d88285e265be790.tar.bz2 openshift-4c80a74d3c8e0ed8a164cf805d88285e265be790.tar.xz openshift-4c80a74d3c8e0ed8a164cf805d88285e265be790.zip | |
Merge pull request #6063 from mgugino-upstream-stage/upgrade-minor-validator-fix
Fix preupgrade authorization objects are in sync minor versions
| -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 |