diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-08-23 10:03:07 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-08-23 10:11:40 -0400 |
| commit | 1a1bd866d168d3a2028077aea23ae0c781ee453c (patch) | |
| tree | 4d7249f14e86ac6b8ef391fa1f7d7d9f7afbc69b | |
| parent | 3e6d4304dfe8b5c0a643ea61addd43f7c60a52b6 (diff) | |
| download | openshift-1a1bd866d168d3a2028077aea23ae0c781ee453c.tar.gz openshift-1a1bd866d168d3a2028077aea23ae0c781ee453c.tar.bz2 openshift-1a1bd866d168d3a2028077aea23ae0c781ee453c.tar.xz openshift-1a1bd866d168d3a2028077aea23ae0c781ee453c.zip | |
Bug 1369410 - uninstall fail at task [restart docker] on atomic-host
* Moved the restarting of docker and network services lower.
* Added /etc/systemd/system/docker.service.d/docker-sdn-ovs.conf to the list of
files to be removed (I suspect the RPM uninstall handles this for
non-containerized installs)
* sorted the file names
| -rw-r--r-- | playbooks/adhoc/uninstall.yml | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index 3be3a0e96..993d629c8 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -92,12 +92,6 @@ - vlinuxbr - vovsbr - - name: restart docker - service: name=docker state=restarted - - - name: restart NetworkManager - service: name=NetworkManager state=restarted - - shell: find /var/lib/origin/openshift.local.volumes -type d -exec umount {} \; 2>/dev/null || true changed_when: False @@ -161,31 +155,39 @@ with_items: - /etc/ansible/facts.d/openshift.fact - /etc/atomic-enterprise + - /etc/dnsmasq.d/origin-dns.conf + - /etc/dnsmasq.d/origin-upstream-dns.conf + - /etc/NetworkManager/dispatcher.d/99-origin-dns.sh - /etc/openshift - /etc/openshift-sdn - /etc/origin - - /etc/systemd/system/atomic-openshift-node.service - - /etc/systemd/system/atomic-openshift-node-dep.service - - /etc/systemd/system/origin-node.service - - /etc/systemd/system/origin-node-dep.service - - /etc/systemd/system/openvswitch.service - /etc/sysconfig/atomic-enterprise-node - /etc/sysconfig/atomic-openshift-node - /etc/sysconfig/atomic-openshift-node-dep - - /etc/sysconfig/origin-node - - /etc/sysconfig/origin-node-dep - /etc/sysconfig/openshift-node - /etc/sysconfig/openshift-node-dep - /etc/sysconfig/openvswitch - /etc/sysconfig/origin-node + - /etc/sysconfig/origin-node + - /etc/sysconfig/origin-node-dep + - /etc/systemd/system/atomic-openshift-node-dep.service + - /etc/systemd/system/atomic-openshift-node.service - /etc/systemd/system/atomic-openshift-node.service.wants + - /etc/systemd/system/docker.service.d/docker-sdn-ovs.conf + - /etc/systemd/system/openvswitch.service + - /etc/systemd/system/origin-node-dep.service + - /etc/systemd/system/origin-node.service - /run/openshift-sdn - /var/lib/atomic-enterprise - /var/lib/openshift - /var/lib/origin - - /etc/NetworkManager/dispatcher.d/99-origin-dns.sh - - /etc/dnsmasq.d/origin-dns.conf - - /etc/dnsmasq.d/origin-upstream-dns.conf + + - name: restart docker + service: name=docker state=restarted + + - name: restart NetworkManager + service: name=NetworkManager state=restarted + - hosts: masters become: yes |