diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-12-06 21:21:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-06 21:21:24 -0500 |
| commit | 308637af4daf979d864592fe05b05c8f3c29f3a3 (patch) | |
| tree | c02f83a4737b6efb415e8dec61308c64c7f74099 /roles/openshift_facts/library | |
| parent | a3ce4c106304773b6002458dfb113de9fd36efde (diff) | |
| parent | ed7b94c19eca79182f7743f2ecab64abf65e2167 (diff) | |
| download | openshift-308637af4daf979d864592fe05b05c8f3c29f3a3.tar.gz openshift-308637af4daf979d864592fe05b05c8f3c29f3a3.tar.bz2 openshift-308637af4daf979d864592fe05b05c8f3c29f3a3.tar.xz openshift-308637af4daf979d864592fe05b05c8f3c29f3a3.zip | |
Merge pull request #2928 from sdodson/etcd3-v2
Fix etcd upgrades to etcd 3.x
Diffstat (limited to 'roles/openshift_facts/library')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 2495ad46c..a6f74168e 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1673,7 +1673,7 @@ 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/etcd3' + 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' @@ -1683,7 +1683,7 @@ def set_container_facts_if_unset(facts): cli_image = master_image node_image = 'aep3_beta/node' ovs_image = 'aep3_beta/openvswitch' - etcd_image = 'registry.access.redhat.com/rhel7/etcd3' + etcd_image = 'registry.access.redhat.com/rhel7/etcd' pod_image = 'aep3_beta/aep-pod' router_image = 'aep3_beta/aep-haproxy-router' registry_image = 'aep3_beta/aep-docker-registry' @@ -1693,7 +1693,7 @@ 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/etcd3' + 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' |