diff options
| author | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-12-02 16:23:36 -0500 |
|---|---|---|
| committer | Wesley Hearn <wesley.s.hearn@gmail.com> | 2015-12-02 16:23:36 -0500 |
| commit | f7835bc727bb2a290ebc42be9e16f3d775b2588b (patch) | |
| tree | e40313defb290c23963d0abddd212b951c354baa /roles/etcd | |
| parent | e14da724f79e1fd75aea03bfab2179c7ef42c3e6 (diff) | |
| parent | af009a7a51d7b6f5799a14c452cc7db92727135e (diff) | |
| download | openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.tar.gz openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.tar.bz2 openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.tar.xz openshift-f7835bc727bb2a290ebc42be9e16f3d775b2588b.zip | |
Merge pull request #966 from maxamillion/fedora
Fedora changes:
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: |