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/tasks | |
| parent | 0a195fb83ecd592ca0b2c897dc240298cd64a75e (diff) | |
move etcdctl.yml from etcd to etcd_common role
Diffstat (limited to 'roles/etcd/tasks')
| -rw-r--r-- | roles/etcd/tasks/etcdctl.yml | 12 | ||||
| -rw-r--r-- | roles/etcd/tasks/main.yml | 4 |
2 files changed, 3 insertions, 13 deletions
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 |