From c9688b8571500878d10632740d14b4b9fb9dcc7f Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Fri, 31 Mar 2017 13:31:42 +0200 Subject: 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 --- roles/etcd/templates/etcdctl.sh.j2 | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 roles/etcd/templates/etcdctl.sh.j2 (limited to 'roles/etcd/templates/etcdctl.sh.j2') diff --git a/roles/etcd/templates/etcdctl.sh.j2 b/roles/etcd/templates/etcdctl.sh.j2 new file mode 100644 index 000000000..ac7d9c72f --- /dev/null +++ b/roles/etcd/templates/etcdctl.sh.j2 @@ -0,0 +1,12 @@ +#!/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 ${@} +} -- cgit v1.2.3