summaryrefslogtreecommitdiffstats
path: root/roles/etcd
diff options
context:
space:
mode:
authorVadim Rutkovsky <vrutkovs@redhat.com>2018-02-10 12:32:33 +0100
committerVadim Rutkovsky <vrutkovs@redhat.com>2018-02-10 12:32:33 +0100
commit6eeb0f5aad9f41f982cbc7dfeadb099cb614b844 (patch)
tree9814689dcd5021a64b86f74ffd2c451b06457de6 /roles/etcd
parentf18cfa7897d771cb973b9aa28a90bc3575b56f58 (diff)
downloadopenshift-6eeb0f5aad9f41f982cbc7dfeadb099cb614b844.tar.gz
openshift-6eeb0f5aad9f41f982cbc7dfeadb099cb614b844.tar.bz2
openshift-6eeb0f5aad9f41f982cbc7dfeadb099cb614b844.tar.xz
openshift-6eeb0f5aad9f41f982cbc7dfeadb099cb614b844.zip
Use r_etcd_common_etcdctl_command instead of hardcoded binary name to support containerized upgrade
Diffstat (limited to 'roles/etcd')
-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