From 1dcf43f235cd6c5125e4f2b60a4301105b7344fe Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Wed, 3 May 2017 11:42:33 +0200
Subject: move etcdctl.yml from etcd to etcd_common role

---
 roles/etcd/tasks/etcdctl.yml              | 12 ------------
 roles/etcd/tasks/main.yml                 |  4 +++-
 roles/etcd/templates/etcdctl.sh.j2        | 12 ------------
 roles/etcd_common/tasks/etcdctl.yml       | 12 ++++++++++++
 roles/etcd_common/templates/etcdctl.sh.j2 | 12 ++++++++++++
 5 files changed, 27 insertions(+), 25 deletions(-)
 delete mode 100644 roles/etcd/tasks/etcdctl.yml
 delete mode 100644 roles/etcd/templates/etcdctl.sh.j2
 create mode 100644 roles/etcd_common/tasks/etcdctl.yml
 create mode 100644 roles/etcd_common/templates/etcdctl.sh.j2

(limited to 'roles')

diff --git a/roles/etcd/tasks/etcdctl.yml b/roles/etcd/tasks/etcdctl.yml
deleted file mode 100644
index 6cb456677..000000000
--- a/roles/etcd/tasks/etcdctl.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- 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/tasks/main.yml b/roles/etcd/tasks/main.yml
index 35117225b..fa2f44609 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -120,7 +120,9 @@
     enabled: yes
   register: start_result
 
-- include: etcdctl.yml
+- include_role:
+    name: etcd_common
+    tasks_from: etcdctl.yml
   when: openshift_etcd_etcdctl_profile | default(true) | bool
 
 - name: Set fact etcd_service_status_changed
diff --git a/roles/etcd/templates/etcdctl.sh.j2 b/roles/etcd/templates/etcdctl.sh.j2
deleted file mode 100644
index ac7d9c72f..000000000
--- a/roles/etcd/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 ${@}
-}
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 ${@}
+}
-- 
cgit v1.2.3