summaryrefslogtreecommitdiffstats
path: root/roles/etcd/tasks
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-12-14 12:47:51 -0500
committerThomas Wiest <twiest@users.noreply.github.com>2015-12-14 12:47:51 -0500
commit4dfe16e0e567a633cedd8ee56ffaed5110ca1629 (patch)
treeaa67c9a14ae30cf02177e53ae3e8d1e9c878f1c8 /roles/etcd/tasks
parenteeb164fae0e6721100c4fcc1717d92bb85b9652c (diff)
parent4322b19c0503a4f149ac5bca251beba14178948d (diff)
downloadopenshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.tar.gz
openshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.tar.bz2
openshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.tar.xz
openshift-4dfe16e0e567a633cedd8ee56ffaed5110ca1629.zip
Merge pull request #1059 from twiest/master
sync master -> prod branch
Diffstat (limited to 'roles/etcd/tasks')
-rw-r--r--roles/etcd/tasks/main.yml7
1 files changed, 1 insertions, 6 deletions
diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml
index efaab5f31..61892fe06 100644
--- a/roles/etcd/tasks/main.yml
+++ b/roles/etcd/tasks/main.yml
@@ -8,12 +8,7 @@
when: "'ipv4' not in hostvars[inventory_hostname]['ansible_' ~ etcd_interface] or 'address' not in hostvars[inventory_hostname]['ansible_' ~ etcd_interface].ipv4"
- name: Install etcd
- yum: pkg=etcd-2.* state=present
- when: ansible_pkg_mgr == "yum"
-
-- name: Install etcd
- dnf: pkg=etcd* state=present
- when: ansible_pkg_mgr == "dnf"
+ action: "{{ ansible_pkg_mgr }} name=etcd-2.* state=present"
- name: Validate permissions on the config dir
file: