diff options
author | Thomas Wiest <twiest@redhat.com> | 2015-12-09 15:48:15 -0500 |
---|---|---|
committer | Thomas Wiest <twiest@redhat.com> | 2015-12-09 15:48:15 -0500 |
commit | 14c69ad397be8ee101ef5b4edfa223d703e67ad0 (patch) | |
tree | 70eee046db8012061c178ab4e686650048265564 /roles/etcd | |
parent | 898290cb3aabbc9d98883181877ac857a2fe1faf (diff) | |
parent | b7b3e6dbdfd17e55055630ce963965818e830620 (diff) | |
download | openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.gz openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.bz2 openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.tar.xz openshift-14c69ad397be8ee101ef5b4edfa223d703e67ad0.zip |
Merge remote-tracking branch 'upstream/master' into prod
Diffstat (limited to 'roles/etcd')
-rw-r--r-- | roles/etcd/README.md | 2 | ||||
-rw-r--r-- | roles/etcd/tasks/main.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/roles/etcd/README.md b/roles/etcd/README.md index 88e4ff874..329a926c0 100644 --- a/roles/etcd/README.md +++ b/roles/etcd/README.md @@ -7,7 +7,7 @@ Requirements ------------ This role assumes it's being deployed on a RHEL/Fedora based host with package -named 'etcd' available via yum. +named 'etcd' available via yum or dnf (conditionally). Role Variables -------------- diff --git a/roles/etcd/tasks/main.yml b/roles/etcd/tasks/main.yml index fcbdecd37..efaab5f31 100644 --- a/roles/etcd/tasks/main.yml +++ b/roles/etcd/tasks/main.yml @@ -9,6 +9,11 @@ - 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" - name: Validate permissions on the config dir file: |