From e8187f6a0fba6b158dfec37a198a64f712ee95c6 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Mon, 5 Jun 2017 10:51:47 -0500 Subject: [PATCH] ceph-mon: fix support for ipv6 on containerized mons The fact ['ansible_$interface']['ipv4'] is a dictionary where ['ansible_$interface']['ipv6'] is a list. If we use ansible_default_ipv6|ipv4 is is always a dictionary which allows us to get the ipv6 and ipv4 address without adding more complexity to the template. Signed-off-by: Andrew Schoen --- roles/ceph-mon/templates/ceph-mon.service.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ceph-mon/templates/ceph-mon.service.j2 b/roles/ceph-mon/templates/ceph-mon.service.j2 index 2a8bb4911..daaebdfd7 100644 --- a/roles/ceph-mon/templates/ceph-mon.service.j2 +++ b/roles/ceph-mon/templates/ceph-mon.service.j2 @@ -23,7 +23,7 @@ ExecStart=/usr/bin/docker run --rm --name ceph-mon-%i --net=host \ --net=host \ {% endif -%} -e CEPH_DAEMON=MON \ - -e MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface][ip_version]['address'] }} \ + -e MON_IP={{ hostvars[inventory_hostname]['ansible_default_' + ip_version]['address'] }} \ -e CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }} \ {{ ceph_mon_docker_extra_env }} \ {{ceph_docker_registry }}/{{ ceph_docker_image }}:{{ ceph_docker_image_tag }}