Merge "Make it possible to override ServiceNetMap per-role" into stable/rocky

overcloud.j2.yaml

@@ -227,6 +227,17 @@ parameters:
     type: json
     description: Optional Role Specific parameters to be provided to service
     default: {}
+
+  {{role.name}}ServiceNetMap:
+    default: {}
+    description: |
+      Role specific ServiceNetMap overrides, the map provided will be merged
+      with the global ServiceNetMap when passing the ServiceNetMap to the
+      {{role.name}}ServiceChain resource and the {{role.name}} resource group.
+      For example:
+      {{role.name}}ServiceNetMap:
+        NovaLibvirtNetwork: internal_api_leaf2
+    type: json
 {% endfor %}
 
   # Identifiers to trigger tasks on nodes
@@ -429,7 +440,10 @@ resources:
     properties:
       Services:
         get_param: {{role.name}}Services
-      ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
+      ServiceNetMap:
+        map_merge:
+          - {get_attr: [ServiceNetMap, service_net_map]}
+          - {get_param: {{role.name}}ServiceNetMap}
       ServiceData:
         net_cidr_map: {get_attr: [NetCidrMapValue, value]}
         net_vip_map: {get_attr: [VipMap, net_ip_map]}
@@ -615,7 +629,10 @@ resources:
         type: OS::TripleO::{{role.name}}
         properties:
           CloudDomain: {get_param: CloudDomain}
-          ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
+          ServiceNetMap:
+            map_merge:
+              - {get_attr: [ServiceNetMap, service_net_map]}
+              - {get_param: {{role.name}}ServiceNetMap}
           EndpointMap: {get_attr: [EndpointMapData, value]}
           Hostname:
             str_replace:

releasenotes/notes/bug-1904482-dbc5162c8245a9b3.yaml

@@ -0,0 +1,21 @@
+---
+fixes:
+  - |
+    When deploying a spine-and-leaf (L3 routed architecture) with TLS enabled
+    for internal endpoints the deployment would fail because some roles are
+    not connected to the network mapped to the service in ServiceNetMap. To
+    fix this issue a role specific parameter ``{{role.name}}ServiceNetMap`` is
+    introduced (defaults to: ``{}``). The role specific ServiceNetMap parameter
+    allow the operator to override one or more service network mappings
+    per-role. For example::
+
+      ComputeLeaf2ServiceNetMap:
+        NovaLibvirtNetwork: internal_api_leaf2
+
+    The role specific ``{{role.name}}ServiceNetMap`` override is merged with
+    the global ``ServiceNetMap`` when it's passed as a value to the
+    ``{{role.name}}ServiceChain`` resources, and the ``{{role.name}}``
+    resource groups so that the correct network for this role is mapped to
+    the service.
+
+    Closes bug: `1904482 <https://bugs.launchpad.net/tripleo/+bug/1904482>`_.