From: Matthew Rees <matthew.rees@secate.com>
Date: Mon, 6 Jun 2016 13:57:51 +0000 (+0200)
Subject: Add fix for those who are using monitor_address
X-Git-Tag: v1.0.6~91^2~4
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9d8ffa5bda4c51fb9189909625b09134d73aef15;p=ceph-ansible.git

Add fix for those who are using monitor_address
---

diff --git a/roles/ceph-common/tasks/checks/check_firewall.yml b/roles/ceph-common/tasks/checks/check_firewall.yml
index e945ccd81..cfe199e5d 100644
--- a/roles/ceph-common/tasks/checks/check_firewall.yml
+++ b/roles/ceph-common/tasks/checks/check_firewall.yml
@@ -14,7 +14,7 @@
     - nmapexist.rc != 0
 
 - name: check if monitor port is not filtered
-  local_action: shell set -o pipefail && nmap -p 6789 {{ item }} {{ hostvars[item]['ansible_' + monitor_interface]['ipv4']['address'] }} | grep -sqo filtered
+  local_action: shell set -o pipefail && nmap -p 6789 {{ item }} {{ hostvars[item]['ansible_' + monitor_interface]['ipv4']['address'] if hostvars[item]['ansible_' + monitor_interface] is defined else hostvars[item][monitor_address] }} | grep -sqo filtered
   changed_when: false
   failed_when: false
   with_items: "{{ groups[mon_group_name] }}"