diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-11-21 11:14:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-21 11:14:43 -0500 |
| commit | d3db256551db1b073bb543e3e3a541bc52b23f32 (patch) | |
| tree | c1ca1b599fced2feb99da3ff407acaa4987e18fd /roles/openshift_facts/library | |
| parent | 2a9e225c9f2f1d1f886c9ff6af0443dcd5fdae17 (diff) | |
| parent | 85efc9cffcc8a80dc3b939c5e4ffcd7825b4300e (diff) | |
| download | openshift-d3db256551db1b073bb543e3e3a541bc52b23f32.tar.gz openshift-d3db256551db1b073bb543e3e3a541bc52b23f32.tar.bz2 openshift-d3db256551db1b073bb543e3e3a541bc52b23f32.tar.xz openshift-d3db256551db1b073bb543e3e3a541bc52b23f32.zip | |
Merge pull request #6197 from mgugino-upstream-stage/etcd-image
Refactor etcd image
Diffstat (limited to 'roles/openshift_facts/library')
| -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 8d0cd55ea..f94e0e097 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1631,7 +1631,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' @@ -1641,7 +1640,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' @@ -1668,8 +1666,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 |