From da1e3e250313f80da47c3241f1c05cb15c123ed7 Mon Sep 17 00:00:00 2001 From: rabi Date: Mon, 27 Jun 2022 14:41:46 +0530 Subject: [PATCH] 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 --- overcloud-resource-registry-puppet.j2.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 3ee6ab278d..6386128703 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -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 %}