summaryrefslogtreecommitdiffstats
path: root/roles/etcd_common
diff options
context:
space:
mode:
authorJan Chaloupka <jchaloup@redhat.com>2017-05-04 22:31:35 +0200
committerGitHub <noreply@github.com>2017-05-04 22:31:35 +0200
commitf7993afb2fec58b7bd13a70d812bf60deb5b1402 (patch)
tree00dcdb4bf13e242caa5106739bbbb879118e0190 /roles/etcd_common
parent0f85adf01fdb6432b9155e31dbfb17ffb731f161 (diff)
parent1dcf43f235cd6c5125e4f2b60a4301105b7344fe (diff)
downloadopenshift-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_common')
-rw-r--r--roles/etcd_common/tasks/etcdctl.yml12
-rw-r--r--roles/etcd_common/templates/etcdctl.sh.j212
2 files changed, 24 insertions, 0 deletions
diff --git a/roles/etcd_common/tasks/etcdctl.yml b/roles/etcd_common/tasks/etcdctl.yml
new file mode 100644
index 000000000..6cb456677
--- /dev/null
+++ b/roles/etcd_common/tasks/etcdctl.yml
@@ -0,0 +1,12 @@
+---
+- name: Install etcd for etcdctl
+ package: name=etcd{{ '-' + etcd_version if etcd_version is defined else '' }} state=present
+ when: not openshift.common.is_atomic | bool
+
+- name: Configure etcd profile.d alises
+ template:
+ dest: "/etc/profile.d/etcdctl.sh"
+ src: etcdctl.sh.j2
+ mode: 0755
+ owner: root
+ group: root
diff --git a/roles/etcd_common/templates/etcdctl.sh.j2 b/roles/etcd_common/templates/etcdctl.sh.j2
new file mode 100644
index 000000000..ac7d9c72f
--- /dev/null
+++ b/roles/etcd_common/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 ${@}
+}