diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-07-03 11:06:18 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-07-05 10:30:53 -0400 |
| commit | 09e74fa8f619038ea06723392ce0d620ffbc6d3a (patch) | |
| tree | e3c17249a47ed0d70c99c22ef8f8426655a83245 /playbooks/adhoc/uninstall.yml | |
| parent | 7b5c476ecd2e6d3cf26bea294e5b7c141d061384 (diff) | |
| parent | 0d0f54af3a02cd0e228210dfae95806d4e644c3b (diff) | |
| download | openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.tar.gz openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.tar.bz2 openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.tar.xz openshift-09e74fa8f619038ea06723392ce0d620ffbc6d3a.zip | |
Merge branch 'master' into encryption
Diffstat (limited to 'playbooks/adhoc/uninstall.yml')
| -rw-r--r-- | playbooks/adhoc/uninstall.yml | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index ddd2ecebd..a1f541712 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -26,6 +26,20 @@ - hosts: nodes become: yes tasks: + - name: Remove dnsmasq dispatcher + file: + path: "{{ item }}" + state: absent + with_items: + - /etc/dnsmasq.d/origin-dns.conf + - /etc/dnsmasq.d/origin-upstream-dns.conf + - /etc/dnsmasq.d/openshift-ansible.conf + - /etc/NetworkManager/dispatcher.d/99-origin-dns.sh + when: openshift_use_dnsmasq | default(true) | bool + - service: + name: NetworkManager + state: restarted + when: openshift_use_dnsmasq | default(true) | bool - name: Stop services service: name={{ item }} state=stopped with_items: @@ -279,9 +293,6 @@ 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/sysconfig/atomic-enterprise-node @@ -307,18 +318,14 @@ - name: restart container-engine service: name=container-engine state=restarted - ignore_errors: true + failed_when: false register: container_engine - name: restart docker service: name=docker state=restarted - ignore_errors: true + failed_when: false when: not (container_engine | changed) - - name: restart NetworkManager - service: name=NetworkManager state=restarted - when: openshift_use_dnsmasq | default(true) | bool - - hosts: masters become: yes vars: |