summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-28 14:52:10 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-28 14:52:10 -0400
commitadaaa1b306bf3019f2ff7673ca919a6363aa6e5c (patch)
treeab21079d442bcfe560d1ee0d5606e5211352f4f7
parent8552ef00125cb1458e6e4a8b60b7532751992e28 (diff)
parente0bd8bfa45d85832e1f619fbf91934dff0706c9c (diff)
downloadopenshift-adaaa1b306bf3019f2ff7673ca919a6363aa6e5c.tar.gz
openshift-adaaa1b306bf3019f2ff7673ca919a6363aa6e5c.tar.bz2
openshift-adaaa1b306bf3019f2ff7673ca919a6363aa6e5c.tar.xz
openshift-adaaa1b306bf3019f2ff7673ca919a6363aa6e5c.zip
Merge pull request #755 from brenton/uninstall
Bug fixes for the uninstall playbook
-rw-r--r--playbooks/adhoc/uninstall.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/playbooks/adhoc/uninstall.yml b/playbooks/adhoc/uninstall.yml
index af2108690..7d1544be8 100644
--- a/playbooks/adhoc/uninstall.yml
+++ b/playbooks/adhoc/uninstall.yml
@@ -16,10 +16,11 @@
- name: Detecting Operating System
shell: ls /run/ostree-booted
ignore_errors: yes
+ failed_when: false
register: ostree_output
- set_fact:
- is_atomic: ostree_output.rc == 0
+ is_atomic: "{{ ostree_output.rc == 0 }}"
- service: name={{ item }} state=stopped
with_items:
@@ -41,7 +42,7 @@
- origin-node
- yum: name={{ item }} state=absent
- when: not is_atomic
+ when: not is_atomic | bool
with_items:
- atomic-enterprise
- atomic-enterprise-master