openstack
/
tripleo-ansible
Code Issues Proposed changes

Set ceph_grafana_vip on storage_dashboard network 

When storage_dashboard composable network is defined, we need
to set ceph_grafana_vip on this network following the same
pattern of the other services and creating an exception.
If storage_dashboard composable network is not defined, no
additional changes are needed.

Depends-On: https://review.opendev.org/#/c/674318
Change-Id: Ib393e2e65821e347179c0c20b87feb99d6d84982
Co-Authored-By: Giulio Fidente <gfidente@redhat.com>
This commit is contained in:
fmount 2019-09-04 12:17:24 +02:00
parent 2f6cc5cdff
commit 2b1dd3e282
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tripleo_ansible/roles/tripleo-hieradata/templates/vip_data.j2
View File

@ -16,6 +16,9 @@
{% if network == 'StorageNFS' %}
{% set _ = vip_data.__setitem__('ganesha_vip', (net_vip_map[storagenfs_net_name])) %}
{% endif %}
{% if network == 'StorageDashboard' %}
{% set _ = vip_data.__setitem__('ceph_grafana_vip', (net_vip_map.storage_dashboard)) %}
{% endif %}
{% endfor %}
{# public_virtual_ip and controller_virtual_ip are needed in both HAproxy & keepalived. #}
{% if 'External' in enabled_networks %}
@ -36,7 +39,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 ['redis', 'ganesha', 'keystone_admin_api_vip', 'keystone_public_api_vip'] %}
{% if service not in ['redis', 'ganesha', 'keystone_admin_api_vip', 'keystone_public_api_vip', 'ceph_grafana'] %}
{% set _ = vip_data.__setitem__((service ~ '_vip'), (net_vip_map[service_net_map[service ~ '_network']])) %}
{% endif %}
{% endif %}