diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-11-20 17:43:08 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-11-20 17:43:08 -0500 |
| commit | 85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e (patch) | |
| tree | 94a48919c5bd29a7653486309b4929fb21ac7d8b /roles/openshift_facts | |
| parent | 6313f519307cf50055589c3876d8bec398bbc4d4 (diff) | |
| download | openshift-85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e.tar.gz openshift-85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e.tar.bz2 openshift-85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e.tar.xz openshift-85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e.zip | |
Refactor etcd image
Simplify logic for etcd_image
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 |
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 99ebb7e36..b370a10d2 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1630,7 +1630,6 @@ def set_container_facts_if_unset(facts): cli_image = master_image node_image = 'openshift3/node' ovs_image = 'openshift3/openvswitch' - etcd_image = 'registry.access.redhat.com/rhel7/etcd' pod_image = 'openshift3/ose-pod' router_image = 'openshift3/ose-haproxy-router' registry_image = 'openshift3/ose-docker-registry' @@ -1640,7 +1639,6 @@ def set_container_facts_if_unset(facts): cli_image = master_image node_image = 'openshift/node' ovs_image = 'openshift/openvswitch' - etcd_image = 'registry.access.redhat.com/rhel7/etcd' pod_image = 'openshift/origin-pod' router_image = 'openshift/origin-haproxy-router' registry_image = 'openshift/origin-docker-registry' @@ -1667,8 +1665,6 @@ def set_container_facts_if_unset(facts): facts['common']['registry_image'] = registry_image if 'deployer_image' not in facts['common']: facts['common']['deployer_image'] = deployer_image - if 'etcd' in facts and 'etcd_image' not in facts['etcd']: - facts['etcd']['etcd_image'] = etcd_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 |