summaryrefslogtreecommitdiffstats
path: root/playbooks/adhoc
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 /playbooks/adhoc
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 'playbooks/adhoc')
-rw-r--r--playbooks/adhoc/uninstall.yml38
1 files changed, 2 insertions, 36 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index d1bb2298a..9161076e5 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -47,42 +47,8 @@
- origin-node
- pcsd
- - yum: name={{ item }} state=absent
- when: ansible_pkg_mgr == "yum" and not is_atomic | bool
- with_items:
- - atomic-enterprise
- - atomic-enterprise-master
- - atomic-enterprise-node
- - atomic-enterprise-sdn-ovs
- - atomic-openshift
- - atomic-openshift-clients
- - atomic-openshift-master
- - atomic-openshift-node
- - atomic-openshift-sdn-ovs
- - corosync
- - etcd
- - openshift
- - openshift-master
- - openshift-node
- - openshift-sdn
- - openshift-sdn-ovs
- - openvswitch
- - origin
- - origin-clients
- - origin-master
- - origin-node
- - origin-sdn-ovs
- - pacemaker
- - pcs
- - tuned-profiles-atomic-enterprise-node
- - tuned-profiles-atomic-openshift-node
- - tuned-profiles-openshift-node
- - tuned-profiles-origin-node
-
- - user: name=hacluster state=absent
-
- - dnf: name={{ item }} state=absent
- when: ansible_pkg_mgr == "dnf" and not is_atomic | bool
+ - action: "{{ ansible_pkg_mgr }} name={{ item }} state=absent"
+ when: not is_atomic | bool
with_items:
- atomic-enterprise
- atomic-enterprise-master