From: Sébastien Han <seb@redhat.com>
Date: Mon, 8 Oct 2018 13:45:58 +0000 (-0400)
Subject: site: use default value for 'cluster' variable
X-Git-Tag: v3.2.0beta4~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=82ec5a29f235a07f396779564e0cec0b9a2ebfdd;p=ceph-ansible.git

site: use default value for 'cluster' variable

If someone's cluster name is 'ceph' then the playbook will fail (with no
errors because of ignore_errors) saying it can not find the variable. So
let's declare the default. If the cluster name is different then it'll
be in group_vars and thus there won't be any failre.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1636962
Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index 7d2e0fb7b..cba5cd896 100644
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -374,14 +374,14 @@
   become: True
   tasks:
     - name: get ceph status from the first monitor
-      command: docker exec ceph-mon-{{ hostvars[groups['mons'][0]]['ansible_hostname'] }} ceph --cluster {{ cluster }} -s
+      command: docker exec ceph-mon-{{ hostvars[groups['mons'][0]]['ansible_hostname'] }} ceph --cluster {{ cluster | default ('ceph') }} -s
       register: ceph_status
       changed_when: false
       delegate_to: "{{ groups['mons'][0] }}"
       run_once: true
       ignore_errors: true # we skip the error if mon_group_name is different than 'mons'
 
-    - name: "show ceph status for cluster {{ cluster }}"
+    - name: "show ceph status for cluster {{ cluster | default ('ceph') }}"
       debug:
         msg: "{{ ceph_status.stdout_lines }}"
       delegate_to: "{{ groups['mons'][0] }}"
diff --git a/site.yml.sample b/site.yml.sample
index a8a4342ff..6ead1290a 100644
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -408,14 +408,14 @@
   become: True
   tasks:
     - name: get ceph status from the first monitor
-      command: ceph --cluster {{ cluster }} -s
+      command: ceph --cluster {{ cluster | default ('ceph') }} -s
       register: ceph_status
       changed_when: false
       delegate_to: "{{ groups['mons'][0] }}"
       run_once: true
       ignore_errors: true # we skip the error if mon_group_name is different than 'mons'
 
-    - name: "show ceph status for cluster {{ cluster }}"
+    - name: "show ceph status for cluster {{ cluster | default ('ceph') }}"
       debug:
         msg: "{{ ceph_status.stdout_lines }}"
       delegate_to: "{{ groups['mons'][0] }}"