summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-07 13:35:46 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-07 15:10:33 -0500
commit4b394fc566333d4d9f4bc789b03b9a68c22bb028 (patch)
tree860179d0fa85a68e624c8d131b50b5b8cd31fae3 /roles/openshift_facts
parentb0ebc4302507ca9464837281ea9cf4aeb5ef4e90 (diff)
downloadopenshift-4b394fc566333d4d9f4bc789b03b9a68c22bb028.tar.gz
openshift-4b394fc566333d4d9f4bc789b03b9a68c22bb028.tar.bz2
openshift-4b394fc566333d4d9f4bc789b03b9a68c22bb028.tar.xz
openshift-4b394fc566333d4d9f4bc789b03b9a68c22bb028.zip
Support openshift_image_tag
This is the containerized openshift_pkg_version equivalent. Originally I was hoping to reuse openshift_pkg_version for containerized installs but the fact that it's very coupled to yum made that pretty ugly. However, I did opt to rely on the previously existing 'openshift_version' variable. Containerized and RPM installs can both use that variable and it will be set appropriately if either openshift_pkg_version or openshift_image_tag are set. I suspect someday containerized installs will be the only option and I didn't can to have thinkgs like openshift_pkg_version and openshift_image_tag in the playbooks anymore the necessary.
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 71e3284af..596e4f894 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -916,7 +916,7 @@ def get_openshift_version(facts, cli_image=None):
if container is not None:
exit_code, output, _ = module.run_command(['docker', 'exec', container, 'openshift', 'version'])
- # if for some reason the container is installed by not running
+ # if for some reason the container is installed but not running
# we'll fall back to using docker run later in this method.
if exit_code == 0:
version = parse_openshift_version(output)