summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-26 11:15:14 -0400
committerGitHub <noreply@github.com>2017-06-26 11:15:14 -0400
commit7bbff6ce7d8e6e8b739e8dd6b6fe3bef913eb296 (patch)
tree2ac72b910ebd90de992cc7d9c8d905e050667986
parent576b7192754ef973ea45243e149967c67daeaa18 (diff)
parent0cb185716ac7aa13a0f976d6b3e58cdc7ada246e (diff)
downloadopenshift-7bbff6ce7d8e6e8b739e8dd6b6fe3bef913eb296.tar.gz
openshift-7bbff6ce7d8e6e8b739e8dd6b6fe3bef913eb296.tar.bz2
openshift-7bbff6ce7d8e6e8b739e8dd6b6fe3bef913eb296.tar.xz
openshift-7bbff6ce7d8e6e8b739e8dd6b6fe3bef913eb296.zip
Merge pull request #4583 from giuseppe/fix-invocation-atomic-v
oc_atomic_container: fix version check for atomic
-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