From fe53162e3578347dfc11ffa6fc9631cc726e0168 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Fri, 5 Mar 2021 20:59:54 +0000
Subject: [PATCH] Adds net_cidr_map variable to allow cidr lists

This patch exposes the net_cidr_map variable so that tasks can
access the list of CIDRs that are valid for a network as opposed
to attempting to build the CIDRs from the network definitions.

In spine-leaf or edge use cases the networks may have multiple
subnets assigned to a given network.

The new Unbound service will use these maps to build lists of
CIDRs allowed to make queries.

Change-Id: I6004519e8b2317d19356c4a2b8bea416b4d94c22
---
 common/deploy-steps.j2 | 5 +++++
 overcloud.j2.yaml      | 1 +
 2 files changed, 6 insertions(+)

diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index a86c6f4b06..15234e8c44 100644
--- a/common/deploy-steps.j2
+++ b/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}
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index aa8cdbe65e..51a49e6c2f 100644
--- a/overcloud.j2.yaml
+++ b/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: