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/flannel | |
| 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/flannel')
| -rw-r--r-- | roles/flannel/README.md | 3 | ||||
| -rw-r--r-- | roles/flannel/tasks/main.yml | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/roles/flannel/README.md b/roles/flannel/README.md index b8aa830ac..8f271aada 100644 --- a/roles/flannel/README.md +++ b/roles/flannel/README.md @@ -7,7 +7,8 @@ Requirements ------------ This role assumes it's being deployed on a RHEL/Fedora based host with package -named 'flannel' available via yum, in version superior to 0.3. +named 'flannel' available via yum or dnf (conditionally), in version superior +to 0.3. Role Variables -------------- diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml index acfb009ec..86e1bc96e 100644 --- a/roles/flannel/tasks/main.yml +++ b/roles/flannel/tasks/main.yml @@ -2,6 +2,12 @@ - name: Install flannel sudo: true yum: pkg=flannel state=present + when: ansible_pkg_mgr == "yum" + +- name: Install flannel + sudo: true + dnf: pkg=flannel state=present + when: ansible_pkg_mgr == "dnf" - name: Set flannel etcd url sudo: true |