diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-10 17:02:24 -0500 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-11-14 08:50:43 -0500 |
| commit | ce4034672fa8f2371b8bbf52ff04747583b4edda (patch) | |
| tree | 34403dafc484ebb4f0379dc577aad3330facd3ac /roles | |
| parent | a5f4561d8cdfd974705105275f718cee9bb249ad (diff) | |
| download | openshift-ce4034672fa8f2371b8bbf52ff04747583b4edda.tar.gz openshift-ce4034672fa8f2371b8bbf52ff04747583b4edda.tar.bz2 openshift-ce4034672fa8f2371b8bbf52ff04747583b4edda.tar.xz openshift-ce4034672fa8f2371b8bbf52ff04747583b4edda.zip | |
Add updates for containerized
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/etcd/etcdctl.sh | 11 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/roles/etcd/etcdctl.sh b/roles/etcd/etcdctl.sh new file mode 100644 index 000000000..0e324a8a9 --- /dev/null +++ b/roles/etcd/etcdctl.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Sets up handy aliases for etcd, need etcdctl2 and etcdctl3 because +# command flags are different between the two. Should work on stand +# alone etcd hosts and master + etcd hosts too because we use the peer keys. +etcdctl2() { + /usr/bin/etcdctl --cert-file /etc/etcd/peer.crt --key-file /etc/etcd/peer.key --ca-file /etc/etcd/ca.crt -C https://`hostname`:2379 ${@} +} + +etcdctl3() { + ETCDCTL_API=3 /usr/bin/etcdctl --cert /etc/etcd/peer.crt --key /etc/etcd/peer.key --cacert /etc/etcd/ca.crt --endpoints https://`hostname`:2379 ${@} +} diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index a28b58e85..d797eb4d3 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1595,7 +1595,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/etcd' + etcd_image = 'registry.access.redhat.com/rhel7/etcd3' pod_image = 'openshift3/ose-pod' router_image = 'openshift3/ose-haproxy-router' registry_image = 'openshift3/ose-docker-registry' @@ -1605,7 +1605,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/etcd' + etcd_image = 'registry.access.redhat.com/rhel7/etcd3' pod_image = 'aep3_beta/aep-pod' router_image = 'aep3_beta/aep-haproxy-router' registry_image = 'aep3_beta/aep-docker-registry' @@ -1615,7 +1615,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/etcd' + etcd_image = 'registry.access.redhat.com/rhel7/etcd3' pod_image = 'openshift/origin-pod' router_image = 'openshift/origin-haproxy-router' registry_image = 'openshift/origin-docker-registry' |