summaryrefslogtreecommitdiffstats
path: root/roles/cockpit
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-09 16:44:55 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-09 16:44:55 -0500
commitec7b8b68b6467e17487ec4c81fbe2c6826e3c889 (patch)
treecba54e9138630742d0788a5cff9f70ec75b93032 /roles/cockpit
parentecae1fcaaf6d83f2fb6dce0624990b2d13c25db9 (diff)
parentb1d30491f1581503003646684137bf2c218660ba (diff)
downloadopenshift-ec7b8b68b6467e17487ec4c81fbe2c6826e3c889.tar.gz
openshift-ec7b8b68b6467e17487ec4c81fbe2c6826e3c889.tar.bz2
openshift-ec7b8b68b6467e17487ec4c81fbe2c6826e3c889.tar.xz
openshift-ec7b8b68b6467e17487ec4c81fbe2c6826e3c889.zip
Merge pull request #1046 from sdodson/yum-dnf-cleanup
Remove yum / dnf duplication
Diffstat (limited to 'roles/cockpit')
-rw-r--r--roles/cockpit/tasks/main.yml16
1 files changed, 1 insertions, 15 deletions
diff --git a/roles/cockpit/tasks/main.yml b/roles/cockpit/tasks/main.yml
index 8410e7c90..b90e7dfd6 100644
--- a/roles/cockpit/tasks/main.yml
+++ b/roles/cockpit/tasks/main.yml
@@ -1,25 +1,11 @@
---
- name: Install cockpit-ws
- yum:
- name: "{{ item }}"
- state: present
+ action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
with_items:
- cockpit-ws
- cockpit-shell
- cockpit-bridge
- "{{ cockpit_plugins }}"
- when: ansible_pkg_mgr == "yum"
-
-- name: Install cockpit-ws
- dnf:
- name: "{{ item }}"
- state: present
- with_items:
- - cockpit-ws
- - cockpit-shell
- - cockpit-bridge
- - "{{ cockpit_plugins }}"
- when: ansible_pkg_mgr == "dnf"
- name: Enable cockpit-ws
service: