Merge "Adds net_cidr_map variable to allow cidr lists"

common/deploy-steps.j2

@@ -228,6 +228,10 @@ parameters:
   RootStackName:
     description: The name of the stack/plan.
     type: string
+  NetCidrMap:
+    description: Mapping of CIDRs to network name
+    type: json
+    default: {}
 
 parameter_groups:
 - label: deprecated
@@ -410,6 +414,7 @@ outputs:
         extra_hosts_entries: {get_param: ExtraHostsEntries}
         vip_hosts_entries: {get_param: VipHostsEntries}
         keystone_resources: {get_param: KeystoneResourcesConfigs}
+        net_cidr_map: {get_param: NetCidrMap}
       common_deploy_steps_playbooks: {get_file: deploy-steps-playbooks-common.yaml}
       common_deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml}
       common_container_config_scripts: {get_file: common-container-config-scripts.yaml}

overcloud.j2.yaml

@@ -1301,6 +1301,7 @@ resources:
 {% for role in roles %}
           - get_attr: [{{role.name}}ServiceChainRoleData, value, keystone_resources]
 {% endfor %}
+      NetCidrMap: {get_attr: [NetCidrMapValue, value]}
 
 outputs:
   ManagedEndpoints: