From ec16fe31f3d381b3a3df291978407f7bd33028c6 Mon Sep 17 00:00:00 2001
From: Matthew Rees <matthew.rees@secate.com>
Date: Mon, 10 Nov 2014 16:28:13 +0200
Subject: [PATCH] monitor_interface template change

This will fix the monitor_interface issue for Vagrant provisioning
while being preferred to using group_var entries for physical
deployments.
---
 group_vars/all                           | 2 +-
 roles/ceph-common/templates/ceph.conf.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/group_vars/all b/group_vars/all
index bac661c30..b5d2708bb 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -16,7 +16,7 @@ dummy:
 
 ## Monitor options
 #
-monitor_interface: eth1
+#monitor_interface: eth1
 #mon_osd_down_out_interval: 600
 #mon_osd_min_down_reporters: 7 # number of OSDs per host + 1
 
diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 0b30ba839..b2e6dc147 100644
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -63,7 +63,7 @@
   {% if hostvars[host]['ansible_hostname'] is defined %}
   [mon.{{ hostvars[host]['ansible_hostname'] }}]
     host = {{ hostvars[host]['ansible_hostname'] }}
-    mon addr = {{ hostvars[host]['ansible_' + hostvars[host]['monitor_interface'] ]['ipv4']['address'] }}
+    mon addr = {{ hostvars[host]['ansible_' + monitor_interface]['ipv4']['address'] }}
   {% endif %}
 {% endfor %}