summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevan Goodwin <dgoodwin@redhat.com>2016-11-17 12:06:21 -0400
committerDevan Goodwin <dgoodwin@redhat.com>2016-11-17 12:08:11 -0400
commit62e5b2a4bc80448af6411faf81c5ea89b739587a (patch)
tree974e0bf0f0cb860ff7e83502adc3f58b802a46f1
parent6782fa3c9e01b02e6a29e676f6bbe53d040b9708 (diff)
downloadopenshift-62e5b2a4bc80448af6411faf81c5ea89b739587a.tar.gz
openshift-62e5b2a4bc80448af6411faf81c5ea89b739587a.tar.bz2
openshift-62e5b2a4bc80448af6411faf81c5ea89b739587a.tar.xz
openshift-62e5b2a4bc80448af6411faf81c5ea89b739587a.zip
Fix yum/subman version check on Atomic.
-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