summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-16 13:36:48 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-16 13:36:48 -0500
commit33a54619a4583322a1fb00b86c6fe379abbe6473 (patch)
treee9facd9ceec38039d659eb2cfcd9e9cd9b7011d7
parent947ea1eae90b678c93b8f8118904f6ce2e3026c8 (diff)
parent24da2c3741fbaa3fbbbcdd4ffa7c16bb7c58a68d (diff)
downloadopenshift-33a54619a4583322a1fb00b86c6fe379abbe6473.tar.gz
openshift-33a54619a4583322a1fb00b86c6fe379abbe6473.tar.bz2
openshift-33a54619a4583322a1fb00b86c6fe379abbe6473.tar.xz
openshift-33a54619a4583322a1fb00b86c6fe379abbe6473.zip
Merge pull request #904 from detiber/uninstallUpdate
Add the native ha services and configs to uninstall
-rw-r--r--playbooks/adhoc/uninstall.yml16
1 files changed, 15 insertions, 1 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index e0dbad900..565bb20a8 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -103,7 +103,7 @@
- shell: find /var/lib/openshift/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true
changed_when: False
- - shell: docker rm -f "{{ item }}"-master "{{ item }}"-node
+ - shell: docker rm -f "{{ item }}"-master "{{ item }}"-node
changed_when: False
failed_when: False
with_items:
@@ -152,10 +152,14 @@
- /etc/sysconfig/atomic-enterprise-master
- /etc/sysconfig/atomic-enterprise-node
- /etc/sysconfig/atomic-openshift-master
+ - /etc/sysconfig/atomic-openshift-master-api
+ - /etc/sysconfig/atomic-openshift-master-controllers
- /etc/sysconfig/atomic-openshift-node
- /etc/sysconfig/openshift-master
- /etc/sysconfig/openshift-node
- /etc/sysconfig/origin-master
+ - /etc/sysconfig/origin-master-api
+ - /etc/sysconfig/origin-master-controllers
- /etc/sysconfig/origin-node
- /root/.kube
- /run/openshift-sdn
@@ -165,6 +169,16 @@
- /var/lib/openshift
- /var/lib/origin
- /var/lib/pacemaker
+ - /usr/lib/systemd/system/atomic-openshift-master-api.service
+ - /usr/lib/systemd/system/atomic-openshift-master-controllers.service
+ - /usr/lib/systemd/system/origin-master-api.service
+ - /usr/lib/systemd/system/origin-master-controllers.service
+
+ # Since we are potentially removing the systemd unit files for separated
+ # master-api and master-controllers services, so we need to reload the
+ # systemd configuration manager
+ - name: Reload systemd manager configuration
+ command: systemctl daemon-reload
- name: restart docker
service: name=docker state=restarted