ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #720 from ceph/mon-addr-fix 

correctly set mon addr when monitor_interface is defined in group_vars
pull/722/head
Leseb 2016-04-21 16:55:45 +02:00
parent f950afef92 95d80ad3d3
commit 9565418411
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/ceph-common/templates/ceph.conf.j2
View File

@ -99,7 +99,8 @@ host = {{ hostvars[host]['ansible_fqdn'] }}
[mon.{{ hostvars[host]['ansible_hostname'] }}] [mon.{{ hostvars[host]['ansible_hostname'] }}]
host = {{ hostvars[host]['ansible_hostname'] }} host = {{ hostvars[host]['ansible_hostname'] }}
{% endif %} {% endif %}
{% if hostvars[host]['monitor_interface'] is defined and hostvars[host]['monitor_interface'] != "interface" %} # we need to check if monitor_interface is defined in the inventory per host or if it's set in a group_vars file
{% if (hostvars[host]['monitor_interface'] is defined and hostvars[host]['monitor_interface'] != "interface") or monitor_interface != "interface" %}
{% include 'mon_addr_interface.j2' %} {% include 'mon_addr_interface.j2' %}
{% else %} {% else %}
{% include 'mon_addr_address.j2' %} {% include 'mon_addr_address.j2' %}