diff options
| author | Adam Miller <admiller@redhat.com> | 2015-11-18 16:19:19 -0600 |
|---|---|---|
| committer | Adam Miller <admiller@redhat.com> | 2015-12-02 14:55:29 -0600 |
| commit | af009a7a51d7b6f5799a14c452cc7db92727135e (patch) | |
| tree | afe2cebb1e98aa52fdf9bc21f03ebdaf4aa27bdc /roles/etcd | |
| parent | ebf659b0c1775f9be3e52a8ef420d568656c10f9 (diff) | |
| download | openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.tar.gz openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.tar.bz2 openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.tar.xz openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.zip | |
Fedora changes:
- ansible bootstrap playbook for Fedora 23+
- add conditionals to handle yum vs dnf
- add Fedora OpenShift COPR
- update BYO host README for repo configs and fedora bootstrap
Fix typo in etcd README, remove unnecessary parens in openshift_node main.yml
rebase on master, update package cache refresh handler for yum vs dnf
Fix typo in etcd README, remove unnecessary parens in openshift_node main.yml
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: |