openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Check for InternalApi in role for HostnameResolveNetwork" into stable/train

This commit is contained in:
Zuul 2020-08-17 15:28:42 +00:00 committed by Gerrit Code Review
parent 9b3edb40dc dd9a9ac768
commit 71acbd5351
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
network/service_net_map.j2.yaml
View File

@ -99,7 +99,11 @@ parameters:
{{role.name}}HostnameResolveNetwork: {{ _service_nets.get('storage', 'ctlplane') }} {{role.name}}HostnameResolveNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
{%- endfor %} {%- endfor %}
{%- for role in roles if not role.name.startswith('Ceph') %} {%- for role in roles if not role.name.startswith('Ceph') %}
{%- if 'InternalApi' in role.networks %}
{{role.name}}HostnameResolveNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} {{role.name}}HostnameResolveNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
{%- else %}
{{role.name}}HostnameResolveNetwork: ctlplane
{%- endif %}
{%- endfor %} {%- endfor %}
# special-case for MetricsQdrNetwork, which will vary depending on role # special-case for MetricsQdrNetwork, which will vary depending on role
{%- for role in roles if role.name == 'CephStorage' or role.name == 'BlockStorage' or role.name == 'ObjectStorage' %} {%- for role in roles if role.name == 'CephStorage' or role.name == 'BlockStorage' or role.name == 'ObjectStorage' %}