Use openshift_cli_image to find version in openshift_facts when conta…

…inerized.
openshift · Oct 15, 2018 · 4884219 · 4884219
1 parent cf68565
commit 4884219
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/playbooks/init/cluster_facts.yml b/playbooks/init/cluster_facts.yml
@@ -21,6 +21,7 @@
         https_proxy: "{{ openshift_https_proxy | default(None) }}"
         no_proxy: "{{ openshift_no_proxy | default(None) }}"
         generate_no_proxy_hosts: "{{ openshift_generate_no_proxy_hosts | default(True) }}"
+        openshift_cli_image: "{{ openshift_cli_image }}"
 
   - name: Set fact of no_proxy_internal_hostnames
     openshift_facts:

diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
@@ -848,8 +848,6 @@ def get_openshift_version(facts):
             version: the current openshift version
     """
     version = None
-    image_type_dict = {'origin': 'openshift/origin',
-                       'openshift-enterprise': 'openshift3/ose'}
 
     # No need to run this method repeatedly on a system if we already know the
     # version
@@ -866,7 +864,13 @@ def get_openshift_version(facts):
         image_tag = get_container_openshift_version(deployment_type)
         if image_tag is None:
             return version
-        cli_image = image_type_dict[deployment_type] + ":" + image_tag
+
+        try:
+            openshift_cli_image = facts['common']['openshift_cli_image']
+        except KeyError:
+            return version
+
+        cli_image = openshift_cli_image + ":" + image_tag
         _, output, _ = module.run_command(['docker', 'run', '--rm', cli_image, 'version'])  # noqa: F405
         version = parse_openshift_version(output)