diff options
author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-04 22:31:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-04 22:31:35 +0200 |
commit | f7993afb2fec58b7bd13a70d812bf60deb5b1402 (patch) | |
tree | 00dcdb4bf13e242caa5106739bbbb879118e0190 /roles/etcd/templates | |
parent | 0f85adf01fdb6432b9155e31dbfb17ffb731f161 (diff) | |
parent | 1dcf43f235cd6c5125e4f2b60a4301105b7344fe (diff) | |
download | openshift-f7993afb2fec58b7bd13a70d812bf60deb5b1402.tar.gz openshift-f7993afb2fec58b7bd13a70d812bf60deb5b1402.tar.bz2 openshift-f7993afb2fec58b7bd13a70d812bf60deb5b1402.tar.xz openshift-f7993afb2fec58b7bd13a70d812bf60deb5b1402.zip |
Merge pull request #4077 from ingvagabund/move-etcdctl-profiles-to-etcd-common
move etcdctl.yml from etcd to etcd_common role
Diffstat (limited to 'roles/etcd/templates')
-rw-r--r-- | roles/etcd/templates/etcdctl.sh.j2 | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/roles/etcd/templates/etcdctl.sh.j2 b/roles/etcd/templates/etcdctl.sh.j2 deleted file mode 100644 index ac7d9c72f..000000000 --- a/roles/etcd/templates/etcdctl.sh.j2 +++ /dev/null @@ -1,12 +0,0 @@ -#!/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 {{ etcd_peer_cert_file }} --key-file {{ etcd_peer_key_file }} --ca-file {{ etcd_peer_ca_file }} -C https://`hostname`:2379 ${@} - -} - -etcdctl3() { - ETCDCTL_API=3 /usr/bin/etcdctl --cert {{ etcd_peer_cert_file }} --key {{ etcd_peer_key_file }} --cacert {{ etcd_peer_ca_file }} --endpoints https://`hostname`:2379 ${@} -} |