diff options
| author | OpenShift Bot <dmcphers+openshiftbot@redhat.com> | 2017-03-13 14:26:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-13 14:26:05 -0400 |
| commit | 3c12d02acd7048ef56ce0baa52c160a25b1fc2cc (patch) | |
| tree | 0c8bc02e731c48f3c238e4cc78581b7d89802976 | |
| parent | 4b3443c50957564ef24a405b51bac778fdc331a7 (diff) | |
| parent | 523bbdc3b58a58b7093eeb315475602616d6529a (diff) | |
| download | openshift-3c12d02acd7048ef56ce0baa52c160a25b1fc2cc.tar.gz openshift-3c12d02acd7048ef56ce0baa52c160a25b1fc2cc.tar.bz2 openshift-3c12d02acd7048ef56ce0baa52c160a25b1fc2cc.tar.xz openshift-3c12d02acd7048ef56ce0baa52c160a25b1fc2cc.zip | |
Merge pull request #3631 from ingvagabund/validate-excluders-on-non-atomic-only
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml b/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml index 5078638b7..38d1cd0f8 100644 --- a/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml +++ b/playbooks/common/openshift-cluster/upgrades/pre/validate_excluder.yml @@ -3,20 +3,23 @@ # - repoquery_cmd # - excluder # - openshift_upgrade_target -- name: Get available excluder version - command: > - {{ repoquery_cmd }} --qf '%{version}' "{{ excluder }}" - register: excluder_version - failed_when: false - changed_when: false +- block: + - name: Get available excluder version + command: > + {{ repoquery_cmd }} --qf '%{version}' "{{ excluder }}" + register: excluder_version + failed_when: false + changed_when: false -- name: Docker excluder version detected - debug: - msg: "{{ excluder }}: {{ excluder_version.stdout }}" + - name: Docker excluder version detected + debug: + msg: "{{ excluder }}: {{ excluder_version.stdout }}" -- name: Check the available {{ excluder }} version is at most of the upgrade target version - fail: - msg: "Available {{ excluder }} version {{ excluder_version.stdout }} is higher than the upgrade target version {{ openshift_upgrade_target }}" - when: + - name: Check the available {{ excluder }} version is at most of the upgrade target version + fail: + msg: "Available {{ excluder }} version {{ excluder_version.stdout }} is higher than the upgrade target version {{ openshift_upgrade_target }}" + when: - "{{ excluder_version.stdout != '' }}" - "{{ excluder_version.stdout.split('.')[0:2] | join('.') | version_compare(openshift_upgrade_target, '>', strict=True) }}" + when: + - not openshift.common.is_atomic | bool |