summaryrefslogtreecommitdiffstats
path: root/roles/etcd/defaults
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-11 09:40:00 -0700
committerGitHub <noreply@github.com>2017-10-11 09:40:00 -0700
commit94656ef680c235f8777d48528c314357673d255c (patch)
tree158897c6f1372ec4a7f00d9771d8bb3569217c5c /roles/etcd/defaults
parent7b5cc97271ae834b9f2e64ec2b17f4ea3208017f (diff)
parent49436b4222a10a53a90686a3b051b99b24f799f8 (diff)
downloadopenshift-94656ef680c235f8777d48528c314357673d255c.tar.gz
openshift-94656ef680c235f8777d48528c314357673d255c.tar.bz2
openshift-94656ef680c235f8777d48528c314357673d255c.tar.xz
openshift-94656ef680c235f8777d48528c314357673d255c.zip
Merge pull request #5672 from ingvagabund/migrate-embedded-etcd
Automatic merge from submit-queue. Migrate embedded etcd to external etcd Trello card: https://trello.com/c/9fnBfkT5/528-migrate-embedded-etcd-hosts-to-external-process?menu=filter&filter=label:committed-3.7 Tested on: - [x] embedded etcd -> external rpm etcd - [x] embedded etcd -> external docker etcd One needs to set the `openshift_image_tag` before running the migration to containerized docker etcd.
Diffstat (limited to 'roles/etcd/defaults')
-rw-r--r--roles/etcd/defaults/main.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml
index 807b9541a..78f231416 100644
--- a/roles/etcd/defaults/main.yaml
+++ b/roles/etcd/defaults/main.yaml
@@ -70,7 +70,8 @@ etcd_listen_peer_urls: "{{ etcd_peer_url_scheme }}://{{ etcd_ip }}:{{ etcd_peer_
etcd_advertise_client_urls: "{{ etcd_url_scheme }}://{{ etcd_ip }}:{{ etcd_client_port }}"
etcd_listen_client_urls: "{{ etcd_url_scheme }}://{{ etcd_ip }}:{{ etcd_client_port }}"
-etcd_peer: 127.0.0.1
+# required role variable
+#etcd_peer: 127.0.0.1
etcdctlv2: "etcdctl --cert-file {{ etcd_peer_cert_file }} --key-file {{ etcd_peer_key_file }} --ca-file {{ etcd_peer_ca_file }} -C https://{{ etcd_peer }}:{{ etcd_client_port }}"
etcd_service: "{{ 'etcd_container' if r_etcd_common_etcd_runtime == 'docker' else 'etcd' }}"