summaryrefslogtreecommitdiffstats
path: root/roles/openshift_facts/library
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-18 15:21:21 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-18 18:16:16 -0500
commit313b15fb2668cbe6738802f913a9caa6203083b2 (patch)
tree533fe287d8b9f05b80f84ebd1dafb37da8025d72 /roles/openshift_facts/library
parentee8592c34d48f9b65b38aab6cfb8f57a4b5edcbd (diff)
downloadopenshift-313b15fb2668cbe6738802f913a9caa6203083b2.tar.gz
openshift-313b15fb2668cbe6738802f913a9caa6203083b2.tar.bz2
openshift-313b15fb2668cbe6738802f913a9caa6203083b2.tar.xz
openshift-313b15fb2668cbe6738802f913a9caa6203083b2.zip
Remove some small items from openshift_facts
Remove some small items from openshift_facts that don't need to be there.
Diffstat (limited to 'roles/openshift_facts/library')
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py25
1 files changed, 0 insertions, 25 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 1ac65100d..6170f15d9 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1278,35 +1278,10 @@ def set_container_facts_if_unset(facts):
dict: the facts dict updated with the generated containerization
facts
"""
- deployment_type = facts['common']['deployment_type']
- if deployment_type == 'openshift-enterprise':
- master_image = 'openshift3/ose'
- pod_image = 'openshift3/ose-pod'
- router_image = 'openshift3/ose-haproxy-router'
- registry_image = 'openshift3/ose-docker-registry'
- deployer_image = 'openshift3/ose-deployer'
- else:
- master_image = 'openshift/origin'
- pod_image = 'openshift/origin-pod'
- router_image = 'openshift/origin-haproxy-router'
- registry_image = 'openshift/origin-docker-registry'
- deployer_image = 'openshift/origin-deployer'
-
facts['common']['is_atomic'] = os.path.isfile('/run/ostree-booted')
if 'is_containerized' not in facts['common']:
facts['common']['is_containerized'] = facts['common']['is_atomic']
- if 'pod_image' not in facts['common']:
- facts['common']['pod_image'] = pod_image
- if 'router_image' not in facts['common']:
- facts['common']['router_image'] = router_image
- if 'registry_image' not in facts['common']:
- facts['common']['registry_image'] = registry_image
- if 'deployer_image' not in facts['common']:
- facts['common']['deployer_image'] = deployer_image
- if 'master' in facts and 'master_image' not in facts['master']:
- facts['master']['master_image'] = master_image
- facts['master']['master_system_image'] = master_image
if safe_get_bool(facts['common']['is_containerized']):
facts['common']['client_binary'] = '/usr/local/bin/oc'