Simplify HostnameResolveNetwork in ServiceNetMap
We're using hardcoded network names which may not be the case when using custom networks and it's overly complex atm. Related-Bug: #1973460 Change-Id: I80ef75a5003e2ad8f42473df2f7bbfaffc8320b3
This commit is contained in:
parent
93c6665a36
commit
da1e3e2503
|
@ -427,21 +427,11 @@ parameter_defaults:
|
|||
# for backwards compatibility, all other roles default to internal_api
|
||||
{%- for role in roles %}
|
||||
{%- if 'ceph' in role.tags|default([]) %}
|
||||
{%- if 'Storage' in role.networks %}
|
||||
{{role.name}}HostnameResolveNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
|
||||
{{role.name}}MetricsQdrNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
|
||||
{%- else %}
|
||||
{{role.name}}HostnameResolveNetwork: ctlplane
|
||||
{{role.name}}MetricsQdrNetwork: ctlplane
|
||||
{%- endif %}
|
||||
{%- else %}
|
||||
{%- if 'InternalApi' in role.networks %}
|
||||
{{role.name}}HostnameResolveNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||
{{role.name}}MetricsQdrNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||
{%- else %}
|
||||
{{role.name}}HostnameResolveNetwork: ctlplane
|
||||
{{role.name}}MetricsQdrNetwork: ctlplane
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
|
||||
|
|
Loading…
Reference in New Issue