summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-28 09:34:52 -0500
committerGitHub <noreply@github.com>2017-11-28 09:34:52 -0500
commit34de448dd7ff5c671628092e51668aa5c89e8e74 (patch)
tree5ccd85720b9718d0b7886b8efd1a7f4e8180c749 /roles/openshift_facts/library
parent374749dd54f4c111d1c2cb6044dc9f961a4f36ce (diff)
parent8db941b0bbdaef033ae4ef7fc3e7aaa3f502e07a (diff)
downloadopenshift-34de448dd7ff5c671628092e51668aa5c89e8e74.tar.gz
openshift-34de448dd7ff5c671628092e51668aa5c89e8e74.tar.bz2
openshift-34de448dd7ff5c671628092e51668aa5c89e8e74.tar.xz
openshift-34de448dd7ff5c671628092e51668aa5c89e8e74.zip
Merge pull request #6280 from mgugino-upstream-stage/cli_image
Remove openshift.common.cli_image
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py4
1 files changed, 0 insertions, 4 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 3c121877a..7a6202546 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1628,7 +1628,6 @@ def set_container_facts_if_unset(facts):
deployment_type = facts['common']['deployment_type']
if deployment_type == 'openshift-enterprise':
master_image = 'openshift3/ose'
- cli_image = master_image
node_image = 'openshift3/node'
ovs_image = 'openshift3/openvswitch'
pod_image = 'openshift3/ose-pod'
@@ -1637,7 +1636,6 @@ def set_container_facts_if_unset(facts):
deployer_image = 'openshift3/ose-deployer'
else:
master_image = 'openshift/origin'
- cli_image = master_image
node_image = 'openshift/node'
ovs_image = 'openshift/openvswitch'
pod_image = 'openshift/origin-pod'
@@ -1656,8 +1654,6 @@ def set_container_facts_if_unset(facts):
if 'is_containerized' not in facts['common']:
facts['common']['is_containerized'] = facts['common']['is_atomic']
- if 'cli_image' not in facts['common']:
- facts['common']['cli_image'] = cli_image
if 'pod_image' not in facts['common']:
facts['common']['pod_image'] = pod_image
if 'router_image' not in facts['common']: