config: fix monitor_interface when not passed in the inventory file

Setting monitor_interface in group_vars/all.yml makes the
hostvars[host]['monitor_interface'] non-existing.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1507922
Signed-off-by: Sébastien Han <seb@redhat.com>
pull/2128/head
Sébastien Han 2017-11-02 14:53:46 +01:00
parent d05206236c
commit ab7eb79212
2 changed files with 44 additions and 23 deletions

View File

@ -50,11 +50,19 @@ mon host = {% if nb_mon > 0 %}
{%- elif ip_version == 'ipv6' -%} {%- elif ip_version == 'ipv6' -%}
[{{ hostvars[host]['monitor_address'] }}] [{{ hostvars[host]['monitor_address'] }}]
{%- endif %} {%- endif %}
{%- else -%} {%- elif hostvars[host]['monitor_interface'] is defined -%}
{% set interface = 'ansible_' + hostvars[host]['monitor_interface'] %}
{% if ip_version == 'ipv4' -%} {% if ip_version == 'ipv4' -%}
{{ hostvars[host]['ansible_' + hostvars[host]['monitor_interface']][ip_version]['address'] }} {{ hostvars[host][interface][ip_version]['address'] }}
{%- elif ip_version == 'ipv6' -%} {%- elif ip_version == 'ipv6' -%}
[{{ hostvars[host]['ansible_' + hostvars[host]['monitor_interface']][ip_version][0]['address'] }}] [{{ hostvars[host][interface][ip_version][0]['address'] }}]
{%- endif %}
{%- else -%}
{% set interface = 'ansible_' + monitor_interface %}
{% if ip_version == 'ipv4' -%}
{{ hostvars[host][interface][ip_version]['address'] }}
{%- elif ip_version == 'ipv6' -%}
[{{ hostvars[host][interface][ip_version][0]['address'] }}]
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{% if not loop.last -%},{%- endif %} {% if not loop.last -%},{%- endif %}
@ -80,13 +88,20 @@ mon host = {% if nb_mon > 0 %}
{%- elif ip_version == 'ipv6' -%} {%- elif ip_version == 'ipv6' -%}
[{{ hostvars[host]['monitor_address'] }}] [{{ hostvars[host]['monitor_address'] }}]
{%- endif %} {%- endif %}
{%- else -%} {%- elif hostvars[host]['monitor_interface'] is defined -%}
{% set interface = 'ansible_' + hostvars[host]['monitor_interface'] %} {% set interface = 'ansible_' + hostvars[host]['monitor_interface'] %}
{% if ip_version == 'ipv4' -%} {% if ip_version == 'ipv4' -%}
{{ hostvars[host][interface][ip_version]['address'] }} {{ hostvars[host][interface][ip_version]['address'] }}
{%- elif ip_version == 'ipv6' -%} {%- elif ip_version == 'ipv6' -%}
[{{ hostvars[host][interface][ip_version][0]['address'] }}] [{{ hostvars[host][interface][ip_version][0]['address'] }}]
{%- endif %} {%- endif %}
{%- else -%}
{% set interface = 'ansible_' + monitor_interface %}
{% if ip_version == 'ipv4' -%}
{{ [interface][ip_version]['address'] }}
{%- elif ip_version == 'ipv6' -%}
[{{ [interface][ip_version][0]['address'] }}]
{%- endif %}
{%- endif %} {%- endif %}
{% if not loop.last -%},{%- endif %} {% if not loop.last -%},{%- endif %}
{%- endfor %} {%- endfor %}

View File

@ -8,48 +8,54 @@ ExecStartPre=-/usr/bin/docker rm ceph-mon-%i
ExecStartPre=$(command -v mkdir) -p /etc/ceph /var/lib/ceph/mon ExecStartPre=$(command -v mkdir) -p /etc/ceph /var/lib/ceph/mon
ExecStart=/usr/bin/docker run --rm --name ceph-mon-%i --net=host \ ExecStart=/usr/bin/docker run --rm --name ceph-mon-%i --net=host \
--memory={{ ceph_mon_docker_memory_limit }} \ --memory={{ ceph_mon_docker_memory_limit }} \
{% if docker_version.split('.')[0] | version_compare('13', '>=') -%} {% if docker_version.split('.')[0] | version_compare('13', '>=') -%}
--cpus={{ ceph_mon_docker_cpu_limit }} \ --cpus={{ ceph_mon_docker_cpu_limit }} \
{% else -%} {% else -%}
--cpu-quota={{ ceph_mon_docker_cpu_limit * 100000 }} \ --cpu-quota={{ ceph_mon_docker_cpu_limit * 100000 }} \
{% endif -%} {% endif -%}
{% if not containerized_deployment_with_kv -%} {% if not containerized_deployment_with_kv -%}
-v /var/lib/ceph:/var/lib/ceph \ -v /var/lib/ceph:/var/lib/ceph \
-v /etc/ceph:/etc/ceph \ -v /etc/ceph:/etc/ceph \
{% else -%} {% else -%}
-e KV_TYPE={{kv_type}} \ -e KV_TYPE={{kv_type}} \
-e KV_IP={{kv_endpoint}}\ -e KV_IP={{kv_endpoint}}\
-e KV_PORT={{kv_port}} \ -e KV_PORT={{kv_port}} \
{% endif -%} {% endif -%}
-v /etc/localtime:/etc/localtime:ro \ -v /etc/localtime:/etc/localtime:ro \
{% if mon_docker_privileged -%} {% if mon_docker_privileged -%}
--privileged \ --privileged \
{% endif -%} {% endif -%}
{% if mon_docker_net_host -%} {% if mon_docker_net_host -%}
--net=host \ --net=host \
{% endif -%} {% endif -%}
-e IP_VERSION={{ ip_version[-1:] }} \ -e IP_VERSION={{ ip_version[-1:] }} \
{% if monitor_address_block != 'subnet' %} {% if monitor_address_block != 'subnet' %}
{% if ip_version == 'ipv4' -%} {% if ip_version == 'ipv4' -%}
-e MON_IP={{ hostvars[inventory_hostname]['ansible_all_' + ip_version + '_addresses'] | ipaddr(monitor_address_block) | first }} \ -e MON_IP={{ hostvars[inventory_hostname]['ansible_all_' + ip_version + '_addresses'] | ipaddr(monitor_address_block) | first }} \
{% elif ip_version == 'ipv6' -%} {% elif ip_version == 'ipv6' -%}
-e MON_IP=[{{ hostvars[inventory_hostname]['ansible_all_' + ip_version + '_addresses'] | ipaddr(monitor_address_block) | first }}] \ -e MON_IP=[{{ hostvars[inventory_hostname]['ansible_all_' + ip_version + '_addresses'] | ipaddr(monitor_address_block) | first }}] \
{% endif -%} {% endif -%}
{% elif hostvars[inventory_hostname]['monitor_address'] is defined and hostvars[inventory_hostname]['monitor_address'] != '0.0.0.0' -%} {% elif hostvars[inventory_hostname]['monitor_address'] is defined and hostvars[inventory_hostname]['monitor_address'] != '0.0.0.0' %}
{% if ip_version == 'ipv4' -%} {% if ip_version == 'ipv4' -%}
-e MON_IP={{ hostvars[inventory_hostname]['monitor_address'] }} \ -e MON_IP={{ hostvars[inventory_hostname]['monitor_address'] }} \
{% elif ip_version == 'ipv6' -%} {% elif ip_version == 'ipv6' -%}
-e MON_IP=[{{ hostvars[inventory_hostname]['monitor_address'] }}] \ -e MON_IP=[{{ hostvars[inventory_hostname]['monitor_address'] }}] \
{% endif -%} {% endif -%}
{% else -%} {% elif hostvars[inventory_hostname]['monitor_interface'] is defined %}
{% set interface = 'ansible_' + hostvars[inventory_hostname]['monitor_interface'] %} {% set interface = 'ansible_' + hostvars[inventory_hostname]['monitor_interface'] %}
{% if ip_version == 'ipv6' -%} {% if ip_version == 'ipv4' -%}
-e MON_IP=[{{ hostvars[inventory_hostname][interface][ip_version][0]['address'] }}] \
{% elif ip_version == 'ipv4' -%}
-e MON_IP={{ hostvars[inventory_hostname][interface][ip_version]['address'] }} \ -e MON_IP={{ hostvars[inventory_hostname][interface][ip_version]['address'] }} \
{% endif -%} {% elif ip_version == 'ipv6' -%}
{% endif -%} -e MON_IP=[{{ hostvars[inventory_hostname][interface][ip_version][0]['address'] }}] \
{% endif -%}
{% else %}
{% set interface = 'ansible_' + monitor_interface %}
{% if ip_version == 'ipv4' -%}
-e MON_IP={{ [interface][ip_version]['address'] }} \
{% elif ip_version == 'ipv6' -%}
-e MON_IP=[{{ [interface][ip_version][0]['address'] }}] \
{% endif -%}
{%- endif %}
-e CLUSTER={{ cluster }} \ -e CLUSTER={{ cluster }} \
-e FSID={{ fsid }} \ -e FSID={{ fsid }} \
-e CEPH_PUBLIC_NETWORK={{ public_network }} \ -e CEPH_PUBLIC_NETWORK={{ public_network }} \