From 7b97d50ff4e884b24b3e66538b5999290cebed76 Mon Sep 17 00:00:00 2001 From: Francesco Pantano Date: Mon, 27 Jan 2020 12:12:00 +0100 Subject: [PATCH] Add grafana vip on the storage network This patch allows us to make sure we set the ceph_grafana_vip on the storage network since it's not the service that should be exposed to the end users. Change-Id: I7728b6a6bbf8447ec3290a13cb7f5807b30cc01f --- tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2 b/tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2 index eaebbcb32..d238f70c7 100644 --- a/tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2 +++ b/tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2 @@ -17,7 +17,7 @@ {% set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[networks['StorageNFS']['name_lower']])) %} {% endif %} {% if network == 'StorageDashboard' %} -{% set _ = vip_data.__setitem__('ceph_grafana_vip', (net_vip_map.storage_dashboard)) %} +{% set _ = vip_data.__setitem__('ceph_dashboard_vip', (net_vip_map[networks['StorageDashboard']['name_lower']])) %} {% endif %} {% endfor %} {# public_virtual_ip and controller_virtual_ip are needed in both HAproxy & keepalived. #} @@ -42,7 +42,7 @@ {% for service in enabled_services %} {% if service_net_map.get(service ~ '_network', 'noop') in net_vip_map %} {# we set explicit vips for these services, no need to calculate them dynamically #} -{% if service not in ['ovn_dbs', 'redis', 'ganesha', 'keystone_admin_api_vip', 'keystone_public_api_vip', 'ceph_grafana'] %} +{% if service not in ['ovn_dbs', 'redis', 'ganesha', 'keystone_admin_api_vip', 'keystone_public_api_vip'] %} {% set _ = vip_data.__setitem__((service ~ '_vip'), (net_vip_map[service_net_map[service ~ '_network']])) %} {% endif %} {# we set the ovn_dbs_vip to the per-network VIP *if* we detect that there is no separate ovn_dbs VIP set (I.e. THT patch for separate OVN VIP is missing) #}