summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-09-01 14:25:53 -0400
committerGitHub <noreply@github.com>2016-09-01 14:25:53 -0400
commit43728fd16e0cd2b295a7b3f5e117b6bfa70cb141 (patch)
tree72c5dc55bf8228305e3a59c529d50ad6c03e0df7 /playbooks
parent8f8eb8b113bf2108e214d89e42e32df416f20c29 (diff)
parente8f20d6d1682b63439dc7c53f770677e907cfdc0 (diff)
downloadopenshift-43728fd16e0cd2b295a7b3f5e117b6bfa70cb141.tar.gz
openshift-43728fd16e0cd2b295a7b3f5e117b6bfa70cb141.tar.bz2
openshift-43728fd16e0cd2b295a7b3f5e117b6bfa70cb141.tar.xz
openshift-43728fd16e0cd2b295a7b3f5e117b6bfa70cb141.zip
Merge pull request #2395 from mkumatag/uninstall_flannel
Add flannel package removal in uninstallation playbook
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/adhoc/uninstall.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index 3be3a0e96..4e54bdf0f 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -72,6 +72,10 @@
- tuned-profiles-openshift-node
- tuned-profiles-origin-node
+ - name: Remove flannel package
+ action: "{{ ansible_pkg_mgr }} name=flannel state=absent"
+ when: openshift_use_flannel | default(false) | bool
+
- shell: systemctl reset-failed
changed_when: False
@@ -289,6 +293,7 @@
- /usr/local/bin/oadm
- /usr/local/bin/oc
- /usr/local/bin/kubectl
+ - /etc/flannel
# Since we are potentially removing the systemd unit files for separated
# master-api and master-controllers services, so we need to reload the