diff options
author | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-03 11:42:33 +0200 |
---|---|---|
committer | Jan Chaloupka <jchaloup@redhat.com> | 2017-05-03 11:42:33 +0200 |
commit | 1dcf43f235cd6c5125e4f2b60a4301105b7344fe (patch) | |
tree | fca0452a91fdfec31b9d2796e0e296ae3d45cb3a /roles/etcd_common | |
parent | 0a195fb83ecd592ca0b2c897dc240298cd64a75e (diff) | |
download | openshift-1dcf43f235cd6c5125e4f2b60a4301105b7344fe.tar.gz openshift-1dcf43f235cd6c5125e4f2b60a4301105b7344fe.tar.bz2 openshift-1dcf43f235cd6c5125e4f2b60a4301105b7344fe.tar.xz openshift-1dcf43f235cd6c5125e4f2b60a4301105b7344fe.zip |
move etcdctl.yml from etcd to etcd_common role
Diffstat (limited to 'roles/etcd_common')
-rw-r--r-- | roles/etcd_common/tasks/etcdctl.yml | 12 | ||||
-rw-r--r-- | roles/etcd_common/templates/etcdctl.sh.j2 | 12 |
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 ${@} +} |