From 0cb185716ac7aa13a0f976d6b3e58cdc7ada246e Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Mon, 26 Jun 2017 11:10:58 +0200 Subject: 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 --- roles/lib_openshift/library/oc_atomic_container.py | 2 +- roles/lib_openshift/src/ansible/oc_atomic_container.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/lib_openshift') 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 -- cgit v1.2.1