summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-10-28 13:40:27 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-10-28 14:49:55 -0400
commite0bd8bfa45d85832e1f619fbf91934dff0706c9c (patch)
tree403d1901732121618b2685ad276fd805bb5100fb /playbooks
parent1a64ccad203ede056c103b5fc65dcea3ec73a0cc (diff)
downloadopenshift-e0bd8bfa45d85832e1f619fbf91934dff0706c9c.tar.gz
openshift-e0bd8bfa45d85832e1f619fbf91934dff0706c9c.tar.bz2
openshift-e0bd8bfa45d85832e1f619fbf91934dff0706c9c.tar.xz
openshift-e0bd8bfa45d85832e1f619fbf91934dff0706c9c.zip
Bug fixes for the uninstall playbook
1) is_atomic wasn't being evaluated properly 2) the way we were detecting it was resulting in a confusion error message being displayed to the user in the case of RHEL 7 Server
Diffstat (limited to 'playbooks')
-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