Merge pull request #2347 from brenton/BZ1369410

Bug 1369410 - uninstall fail at task [restart docker] on atomic-host

playbooks/adhoc/uninstall.yml

@@ -96,12 +96,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
 
@@ -165,31 +159,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