diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-26 21:02:41 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-26 21:02:41 -0700 |
commit | e470434850316b7c12758957aaaf3e917e60ac74 (patch) | |
tree | 5b8e907c128e504b6ad151ec9a73845989f7f554 /roles/etcd_common/templates | |
parent | 944e91554d0de4dccbf82cb799a016c320e97245 (diff) | |
parent | 18306e3401818cfd9723b6813987308f584c6ea3 (diff) | |
download | openshift-e470434850316b7c12758957aaaf3e917e60ac74.tar.gz openshift-e470434850316b7c12758957aaaf3e917e60ac74.tar.bz2 openshift-e470434850316b7c12758957aaaf3e917e60ac74.tar.xz openshift-e470434850316b7c12758957aaaf3e917e60ac74.zip |
Merge pull request #5470 from ingvagabund/consolidate-etcd-common-role
Automatic merge from submit-queue
Consolidate etcd common role
The last PR toward a single etcd role
Diffstat (limited to 'roles/etcd_common/templates')
-rw-r--r-- | roles/etcd_common/templates/etcdctl.sh.j2 | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/roles/etcd_common/templates/etcdctl.sh.j2 b/roles/etcd_common/templates/etcdctl.sh.j2 deleted file mode 100644 index ac7d9c72f..000000000 --- a/roles/etcd_common/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 ${@} -} |