openstack/tripleo-ansible
Code Issues Proposed changes

Add grafana vip on the storage network

Browse Source 
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
This commit is contained in:
Francesco Pantano 2020-01-27 12:12:00 +01:00
parent dac34d302c
commit 7b97d50ff4
No known key found for this signature in database
GPG Key ID: 799868C47301D458
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleo_ansible/roles/tripleo_hieradata/templates/vip_data.j2
View File

@ -17,7 +17,7 @@
{% set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[networks['StorageNFS']['name_lower']])) %} {% set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[networks['StorageNFS']['name_lower']])) %}
{% endif %} {% endif %}
{% if network == 'StorageDashboard' %} {% 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 %} {% endif %}
{% endfor %} {% endfor %}
{# public_virtual_ip and controller_virtual_ip are needed in both HAproxy & keepalived. #} {# public_virtual_ip and controller_virtual_ip are needed in both HAproxy & keepalived. #}
@ -42,7 +42,7 @@
{% for service in enabled_services %} {% for service in enabled_services %}
{% if service_net_map.get(service ~ '_network', 'noop') in net_vip_map %} {% 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 #} {# 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']])) %} {% set _ = vip_data.__setitem__((service ~ '_vip'), (net_vip_map[service_net_map[service ~ '_network']])) %}
{% endif %} {% 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) #} {# 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) #}