From: Andrew Schoen <aschoen@redhat.com>
Date: Thu, 22 Dec 2016 17:37:41 +0000 (-0600)
Subject: purge-cluster: use ignore_errors: true when including group_vars files
X-Git-Tag: v2.1.2^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67c24cfed080ef2724f9668c21ebc71d76d55b53;p=ceph-ansible.git

purge-cluster: use ignore_errors: true when including group_vars files

Using failed_when will still throw an exception and stop the playbook if
the file you're trying to include doesn't exist.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit c9e5914377b847f6892d068456ff9dae3074d19d)
---

diff --git a/infrastructure-playbooks/purge-cluster.yml b/infrastructure-playbooks/purge-cluster.yml
index ec4426824..1bfe1829a 100644
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@@ -74,9 +74,9 @@
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-mds/defaults/main.yml
   - include_vars: group_vars/all.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ mds_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
 
   - name: stop ceph.target with systemd
     service:
@@ -125,9 +125,9 @@
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-rgw/defaults/main.yml
   - include_vars: group_vars/all.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ rgw_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
 
   - name: stop ceph.target with systemd
     service:
@@ -176,9 +176,9 @@
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-rbd-mirror/defaults/main.yml
   - include_vars: group_vars/all.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ rbdmirror_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
 
   - name: stop ceph.target with systemd
     service:
@@ -221,9 +221,9 @@
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-nfs/defaults/main.yml
   - include_vars: group_vars/all.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ nfs_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
 
   - name: stop ceph.target with systemd
     service:
@@ -290,9 +290,9 @@
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: roles/ceph-osd/defaults/main.yml
   - include_vars: group_vars/all.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ osd_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
 
   - name: check for a device list
     fail:
@@ -422,8 +422,8 @@
       sgdisk --delete $partition_nb $raw_device
     with_items: "{{ ceph_journal_partition_to_erase_path.stdout_lines }}"
     when:
-      ceph_journal_partlabels.rc == 0 and
-      zap_block_devs
+      - ceph_journal_partlabels.rc == 0
+      - zap_block_devs
 
 
 - name: purge ceph mon cluster
@@ -444,11 +444,11 @@
   - include_vars: roles/ceph-mon/defaults/main.yml
   - include_vars: roles/ceph-restapi/defaults/main.yml
   - include_vars: group_vars/all.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ mon_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ restapi_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
 
   - name: stop ceph.target with systemd
     service:
@@ -670,21 +670,21 @@
   tasks:
   - include_vars: roles/ceph-common/defaults/main.yml
   - include_vars: group_vars/all.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ mds_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ rgw_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ rbdmirror_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ nfs_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ osd_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ mon_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
   - include_vars: group_vars/{{ restapi_group_name }}.yml
-    failed_when: false
+    ignore_errors: true
 
   - name: purge fetch directory for localhost
     file: