diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-12 13:21:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-12 13:21:00 -0400 |
| commit | e27714c4376b60334def40587d482883c2a7eb31 (patch) | |
| tree | 08f14727f0b632a3e40876c63fb76e3067b88589 | |
| parent | eb18b3c3b85da23853b9e0c3607d5b8b56f51811 (diff) | |
| parent | 5fd53eac18390429ff272fd775a0a5ec86dd479d (diff) | |
| download | openshift-e27714c4376b60334def40587d482883c2a7eb31.tar.gz openshift-e27714c4376b60334def40587d482883c2a7eb31.tar.bz2 openshift-e27714c4376b60334def40587d482883c2a7eb31.tar.xz openshift-e27714c4376b60334def40587d482883c2a7eb31.zip | |
Merge pull request #2438 from abutcher/flannel-uninstall
Check for is_atomic when uninstalling flannel package.
| -rw-r--r-- | playbooks/adhoc/uninstall.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml index 30e0f05fd..cd569937c 100644 --- a/playbooks/adhoc/uninstall.yml +++ b/playbooks/adhoc/uninstall.yml @@ -74,7 +74,7 @@ - name: Remove flannel package action: "{{ ansible_pkg_mgr }} name=flannel state=absent" - when: openshift_use_flannel | default(false) | bool + when: openshift_use_flannel | default(false) | bool and not is_atomic | bool - shell: systemctl reset-failed changed_when: False |