summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-02-12 09:12:04 -0800
committerGitHub <noreply@github.com>2018-02-12 09:12:04 -0800
commit848f3ea5c6f6adbf63a835880a72de47e387e771 (patch)
tree439da0e682f6cde78230e94c588567e6c219aaf9
parent73a0b0eaa3844d4717eb8827c619594bb47acab9 (diff)
parent6eeb0f5aad9f41f982cbc7dfeadb099cb614b844 (diff)
downloadopenshift-848f3ea5c6f6adbf63a835880a72de47e387e771.tar.gz
openshift-848f3ea5c6f6adbf63a835880a72de47e387e771.tar.bz2
openshift-848f3ea5c6f6adbf63a835880a72de47e387e771.tar.xz
openshift-848f3ea5c6f6adbf63a835880a72de47e387e771.zip
Merge pull request #7099 from vrutkovs/etcd-containerized-upgrade
Automatic merge from submit-queue. Use r_etcd_common_etcdctl_command instead of hardcoded binary name to support containerized upgrade etcdctlv2 is used to check cluster health pre- and post-upgrade
-rw-r--r--roles/etcd/defaults/main.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/etcd/defaults/main.yaml b/roles/etcd/defaults/main.yaml
index 87e249642..6f1dc5847 100644
--- a/roles/etcd/defaults/main.yaml
+++ b/roles/etcd/defaults/main.yaml
@@ -78,7 +78,7 @@ etcd_listen_client_urls: "{{ etcd_url_scheme }}://{{ etcd_ip }}:{{ etcd_client_p
# 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 }}"
+etcdctlv2: "{{ r_etcd_common_etcdctl_command }} --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' }}"
# Location of the service file is fixed and not meant to be changed