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.

diff --git a/group_vars/all b/group_vars/all
index bac661c30dad6741f6514c838e47b426f8d1b85e..b5d2708bb87882c57fa7420ee9ad33c55e787f6b 100644 (file)
--- 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 0b30ba8396ba9e3d8213fd6390c650ed84796a87..b2e6dc1473ff2af77a96a004b696ab8285e10d1b 100644 (file)
--- 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 %}