diff options
author | Jan Chaloupka <jchaloup@redhat.com> | 2017-03-31 13:31:42 +0200 |
---|---|---|
committer | Jan Chaloupka <jchaloup@redhat.com> | 2017-04-28 09:59:11 +0200 |
commit | c9688b8571500878d10632740d14b4b9fb9dcc7f (patch) | |
tree | 504d1db512112769cb9ee787513e2f6db526416f /roles/etcd/files | |
parent | ee21913b9b1d82965abeaa7fe84e54c46201cc49 (diff) | |
download | openshift-c9688b8571500878d10632740d14b4b9fb9dcc7f.tar.gz openshift-c9688b8571500878d10632740d14b4b9fb9dcc7f.tar.bz2 openshift-c9688b8571500878d10632740d14b4b9fb9dcc7f.tar.xz openshift-c9688b8571500878d10632740d14b4b9fb9dcc7f.zip |
Refactor etcd roles
- introduce block and simplify when conditions
- introduce config.yml so the self-standing etcd role can be run (e.g. to test etcd cluster deployment)
- remove empty task files
- skip dependency on openshift_etcd_ca
- replace cert paths with their appropriate variables
Diffstat (limited to 'roles/etcd/files')
-rw-r--r-- | roles/etcd/files/etcdctl.sh | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/roles/etcd/files/etcdctl.sh b/roles/etcd/files/etcdctl.sh deleted file mode 100644 index 0e324a8a9..000000000 --- a/roles/etcd/files/etcdctl.sh +++ /dev/null @@ -1,11 +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 /etc/etcd/peer.crt --key-file /etc/etcd/peer.key --ca-file /etc/etcd/ca.crt -C https://`hostname`:2379 ${@} -} - -etcdctl3() { - ETCDCTL_API=3 /usr/bin/etcdctl --cert /etc/etcd/peer.crt --key /etc/etcd/peer.key --cacert /etc/etcd/ca.crt --endpoints https://`hostname`:2379 ${@} -} |