summaryrefslogtreecommitdiffstats
path: root/roles/etcd_common
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-25 08:11:44 -0700
committerGitHub <noreply@github.com>2017-09-25 08:11:44 -0700
commit67ff061a940a4b9dce6686b8a00a3eb52aeeb698 (patch)
tree0c5fb80ab97cf0762a496a798c05ff85067178af /roles/etcd_common
parentc390d382a2c1783964179490eec810ee2206fa32 (diff)
parent2c8d16c36b8eec5c2a82fb5da7291736654e55f2 (diff)
downloadopenshift-67ff061a940a4b9dce6686b8a00a3eb52aeeb698.tar.gz
openshift-67ff061a940a4b9dce6686b8a00a3eb52aeeb698.tar.bz2
openshift-67ff061a940a4b9dce6686b8a00a3eb52aeeb698.tar.xz
openshift-67ff061a940a4b9dce6686b8a00a3eb52aeeb698.zip
Merge pull request #5451 from ingvagabund/consolidate-etcd-upgrade
Automatic merge from submit-queue Consolidate etcd upgrade Consolidates `etcd_upgrade` into the `etcd` role.
Diffstat (limited to 'roles/etcd_common')
-rw-r--r--roles/etcd_common/defaults/main.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/etcd_common/defaults/main.yml b/roles/etcd_common/defaults/main.yml
index b67411f40..6705e1ac5 100644
--- a/roles/etcd_common/defaults/main.yml
+++ b/roles/etcd_common/defaults/main.yml
@@ -73,3 +73,6 @@ etcd_advertise_client_urls: "{{ etcd_url_scheme }}://{{ etcd_ip }}:{{ etcd_clien
etcd_listen_client_urls: "{{ etcd_url_scheme }}://{{ etcd_ip }}:{{ etcd_client_port }}"
etcd_systemd_dir: "/etc/systemd/system/{{ etcd_service }}.service.d"
+
+# etcd_peer needs to be set by a role caller
+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 }}"