diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-12-14 12:47:51 -0500 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-12-14 12:47:51 -0500 |
| commit | 4dfe16e0e567a633cedd8ee56ffaed5110ca1629 (patch) | |
| tree | aa67c9a14ae30cf02177e53ae3e8d1e9c878f1c8 /roles/flannel | |
| parent | eeb164fae0e6721100c4fcc1717d92bb85b9652c (diff) | |
| parent | 4322b19c0503a4f149ac5bca251beba14178948d (diff) | |
| download | openshift-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/flannel')
| -rw-r--r-- | roles/flannel/tasks/main.yml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/roles/flannel/tasks/main.yml b/roles/flannel/tasks/main.yml index 86e1bc96e..1e86176ea 100644 --- a/roles/flannel/tasks/main.yml +++ b/roles/flannel/tasks/main.yml @@ -1,13 +1,7 @@ --- - 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" + action: "{{ ansible_pkg_mgr }} name=flannel state=present" - name: Set flannel etcd url sudo: true |