diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-06 15:04:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-06 15:04:07 -0800 |
| commit | a62b37b9109ce17f36254b9374e7fda803198de6 (patch) | |
| tree | 633a9926edf79a521d97fe84bda48ff9528ba147 | |
| parent | f6068e5ce99c91d0f6fb7f1a1bfc3b82dc9776af (diff) | |
| parent | 45f01526ef99608f897e2482c645876862a8d9df (diff) | |
| download | openshift-a62b37b9109ce17f36254b9374e7fda803198de6.tar.gz openshift-a62b37b9109ce17f36254b9374e7fda803198de6.tar.bz2 openshift-a62b37b9109ce17f36254b9374e7fda803198de6.tar.xz openshift-a62b37b9109ce17f36254b9374e7fda803198de6.zip | |
Merge pull request #6024 from mgugino-upstream-stage/upgrade-validator-fix
Automatic merge from submit-queue.
Fix preupgrade authorization objects are in sync
Currently, this task is executed based on openshift_version.
openshift_version is based on the upgrade target, thus not
the currently install versions.
This commit ensures that the task executes as intended.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1508301
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml b/playbooks/common/openshift-cluster/upgrades/v3_7/validator.yml index 8e4f99c91..022b4b4fb 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_version | version_compare('3.7','<') + when: openshift_upgrade_target | version_compare('3.8','<') changed_when: false register: l_oc_result until: l_oc_result.rc == 0 |