From fcacf90939c16ed28dfdfd7aa2ac6f43048e1a3d Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Sat, 5 Nov 2016 10:50:46 -0500 Subject: [PATCH] common: check for monitor_interface before monitor_address in ceph.conf Signed-off-by: Andrew Schoen Resolves: testing#updates --- roles/ceph-common/templates/ceph.conf.j2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2 index 25e513369..7cf82fe5f 100644 --- a/roles/ceph-common/templates/ceph.conf.j2 +++ b/roles/ceph-common/templates/ceph.conf.j2 @@ -21,21 +21,21 @@ mon initial members = {% if groups[mon_group_name] is defined %}{% for host in g {% endif %} {% if not mon_containerized_deployment and not mon_containerized_deployment_with_kv %} -{% if monitor_address_block is defined %} +{% if monitor_address_block %} mon host = {% for host in groups[mon_group_name] %}{{ hostvars[host]['ansible_all_ipv4_addresses'] | ipaddr(monitor_address_block) | first }}{% if not loop.last %},{% endif %}{% endfor %} {% elif groups[mon_group_name] is defined %} mon host = {% for host in groups[mon_group_name] %} {% set address = hostvars[host]['monitor_address'] if hostvars[host]['monitor_address'] is defined else monitor_address %} {% set interface = hostvars[host]['monitor_interface'] if hostvars[host]['monitor_interface'] is defined else monitor_interface %} - {% if address != "0.0.0.0" -%} - {{ address }} - {%- else %} + {% if interface != "interface" %} {% for key in hostvars[host].iterkeys() %} {% if hostvars[host][key]['macaddress'] is defined and hostvars[host][key]['device'] is defined and hostvars[host][key]['device'] == interface -%} {{ hostvars[host][key]['ipv4']['address'] }} {%- endif %} {% endfor %} - {% endif %} + {% elif address != "0.0.0.0" -%} + {{ address }} + {%- endif %} {%- if not loop.last %},{% endif %} {% endfor %} {% endif %} -- 2.39.5