summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-11-18 17:28:12 -0500
committerGitHub <noreply@github.com>2016-11-18 17:28:12 -0500
commitf5d74f47e0c22c24ca9f34f9a979c730d8e6ffd3 (patch)
treecd88a7a776aa0bec0b1a4f7d012cc645d3e27714 /playbooks/common
parent9b4df8fb52ae0978d3ad85513968a97a39a1bfbd (diff)
parent62e5b2a4bc80448af6411faf81c5ea89b739587a (diff)
downloadopenshift-f5d74f47e0c22c24ca9f34f9a979c730d8e6ffd3.tar.gz
openshift-f5d74f47e0c22c24ca9f34f9a979c730d8e6ffd3.tar.bz2
openshift-f5d74f47e0c22c24ca9f34f9a979c730d8e6ffd3.tar.xz
openshift-f5d74f47e0c22c24ca9f34f9a979c730d8e6ffd3.zip
Merge pull request #2820 from dgoodwin/yum-check-skip-atomic
Fix yum/subman version check on Atomic.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/initialize_openshift_version.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
index 2f384ddea..a1bd1bd92 100644
--- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml
+++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml
@@ -12,9 +12,10 @@
{{ repoquery_cmd }} --installed --qf '%{version}' "yum"
register: yum_ver_test
changed_when: false
+ when: not openshift.common.is_atomic | bool
- fail:
msg: Incompatible versions of yum and subscription-manager found. You may need to update yum and yum-utils.
- when: "'Plugin \"search-disabled-repos\" requires API 2.7. Supported API is 2.6.' in yum_ver_test.stdout"
+ when: "not openshift.common.is_atomic | bool and 'Plugin \"search-disabled-repos\" requires API 2.7. Supported API is 2.6.' in yum_ver_test.stdout"
- name: Determine openshift_version to configure on first master
hosts: oo_first_master