make radosgw_interface configurable for haproxy

diff --git a/group_vars/all b/group_vars/all
index 7caa4846df5cdd731631f158c0c8ce24869bd005..22e46b047905386ce90134a50562725cab97c2d2 100644 (file)
--- a/group_vars/all
+++ b/group_vars/all
@@ -20,6 +20,7 @@ mds: true # disable mds configuration in ceph.conf
 # Rados Gateway options
 radosgw: true
 redhat_distro_ceph_extra: centos6.4 # supported distros are centos6.3, centos6.4, centos6, fedora18, fedora19, opensuse12.2, rhel6.3, rhel6.4, rhel6.5, rhel6, sles11sp2
+radosgw_interface: eth1
 
 # OSD options
 journal_size: 100

diff --git a/roles/haproxy/templates/precise/haproxy.cfg b/roles/haproxy/templates/precise/haproxy.cfg
index 058821e6321c8f5495e7ea348061e66fd7adf6d1..55f2e4812840a14089c708db79ce592033232290 100644 (file)
--- a/roles/haproxy/templates/precise/haproxy.cfg
+++ b/roles/haproxy/templates/precise/haproxy.cfg
@@ -46,7 +46,7 @@ backend rgw
        balance roundrobin
        cookie RADOSGWLB insert indirect nocache
 {% for host in groups['rgws'] %}
-       server {{ hostvars[host].ansible_hostname }} {{ hostvars[host]['ansible_eth0'].ipv4.address }}:80 check cookie {{ hostvars[host].ansible_hostname }}
+       server {{ hostvars[host].ansible_hostname }} {{ hostvars[host]['ansible_' + radosgw_interface ].ipv4.address }}:80 check cookie {{ hostvars[host].ansible_hostname }}
 {% endfor %}
 
 listen stats :8080