summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-07 09:26:09 -0400
committerGitHub <noreply@github.com>2017-06-07 09:26:09 -0400
commit051e26810146827f361fcf7fa815b37493ad30d7 (patch)
treed837a199255f7d7410b43c7671bf5bfbc59eb53e
parent71dd7c814ca41bf18f3f6a52eaf13c8285ea3f24 (diff)
parent3c336375bf7b377a070250f684b5bc61687fc1e5 (diff)
downloadopenshift-051e26810146827f361fcf7fa815b37493ad30d7.tar.gz
openshift-051e26810146827f361fcf7fa815b37493ad30d7.tar.bz2
openshift-051e26810146827f361fcf7fa815b37493ad30d7.tar.xz
openshift-051e26810146827f361fcf7fa815b37493ad30d7.zip
Merge pull request #4376 from abutcher/uninstall-client-config
Separate client config removal in uninstall s.t. ansible_ssh_user is removed from with_items.
-rw-r--r--playbooks/adhoc/uninstall.yml12
1 files changed, 10 insertions, 2 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index 1c8257162..97d835eae 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -393,10 +393,19 @@
- "{{ directories.results | default([]) }}"
- files
+ - set_fact:
+ client_users: "{{ [ansible_ssh_user, 'root'] | unique }}"
+
+ - name: Remove client kubeconfigs
+ file:
+ path: "~{{ item }}/.kube"
+ state: absent
+ with_items:
+ - "{{ client_users }}"
+
- name: Remove remaining files
file: path={{ item }} state=absent
with_items:
- - "~{{ ansible_ssh_user }}/.kube"
- /etc/ansible/facts.d/openshift.fact
- /etc/atomic-enterprise
- /etc/corosync
@@ -421,7 +430,6 @@
- /etc/sysconfig/origin-master
- /etc/sysconfig/origin-master-api
- /etc/sysconfig/origin-master-controllers
- - /root/.kube
- /usr/share/openshift/examples
- /var/lib/atomic-enterprise
- /var/lib/openshift