summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-06-26 11:10:58 +0200
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-06-26 15:44:01 +0200
commit0cb185716ac7aa13a0f976d6b3e58cdc7ada246e (patch)
treef4290aaf0c949631a21486074472aa297563e753 /roles
parent88690667342bca0e7df75bc90bb1846b63d6d78a (diff)
downloadopenshift-0cb185716ac7aa13a0f976d6b3e58cdc7ada246e.tar.gz
openshift-0cb185716ac7aa13a0f976d6b3e58cdc7ada246e.tar.bz2
openshift-0cb185716ac7aa13a0f976d6b3e58cdc7ada246e.tar.xz
openshift-0cb185716ac7aa13a0f976d6b3e58cdc7ada246e.zip
oc_atomic_container: use rpm to check the version.
Some versions of atomic report their version wrong. Use rpm to check it. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles')
-rw-r--r--roles/lib_openshift/library/oc_atomic_container.py2
-rw-r--r--roles/lib_openshift/src/ansible/oc_atomic_container.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_openshift/library/oc_atomic_container.py b/roles/lib_openshift/library/oc_atomic_container.py
index 91c0d752f..955c6313e 100644
--- a/roles/lib_openshift/library/oc_atomic_container.py
+++ b/roles/lib_openshift/library/oc_atomic_container.py
@@ -194,7 +194,7 @@ def main():
)
# Verify that the platform supports atomic command
- rc, version_out, err = module.run_command('atomic -v', check_rc=False)
+ rc, version_out, err = module.run_command('rpm -q --queryformat "%{VERSION}\n" atomic', check_rc=False)
if rc != 0:
module.fail_json(msg="Error in running atomic command", err=err)
# This module requires atomic version 1.17.2 or later
diff --git a/roles/lib_openshift/src/ansible/oc_atomic_container.py b/roles/lib_openshift/src/ansible/oc_atomic_container.py
index 16848e9c6..7b81760df 100644
--- a/roles/lib_openshift/src/ansible/oc_atomic_container.py
+++ b/roles/lib_openshift/src/ansible/oc_atomic_container.py
@@ -130,7 +130,7 @@ def main():
)
# Verify that the platform supports atomic command
- rc, version_out, err = module.run_command('atomic -v', check_rc=False)
+ rc, version_out, err = module.run_command('rpm -q --queryformat "%{VERSION}\n" atomic', check_rc=False)
if rc != 0:
module.fail_json(msg="Error in running atomic command", err=err)
# This module requires atomic version 1.17.2 or later