浏览代码

Merge pull request #2395 from mkumatag/uninstall_flannel

Add flannel package removal in uninstallation playbook
Scott Dodson 8 年之前
父节点
当前提交
43728fd16e
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      playbooks/adhoc/uninstall.yml

+ 5 - 0
playbooks/adhoc/uninstall.yml

@@ -72,6 +72,10 @@
     - tuned-profiles-openshift-node
     - tuned-profiles-openshift-node
     - tuned-profiles-origin-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
   - shell: systemctl reset-failed
     changed_when: False
     changed_when: False
 
 
@@ -289,6 +293,7 @@
     - /usr/local/bin/oadm
     - /usr/local/bin/oadm
     - /usr/local/bin/oc
     - /usr/local/bin/oc
     - /usr/local/bin/kubectl
     - /usr/local/bin/kubectl
+    - /etc/flannel
 
 
   # Since we are potentially removing the systemd unit files for separated
   # Since we are potentially removing the systemd unit files for separated
   # master-api and master-controllers services, so we need to reload the
   # master-api and master-controllers services, so we need to reload the