Allow 'ctlplane' to be used within Net IP Maps

When using network isolation you might want to selective
move one of the services back to the default ctlplane network
by simply using the ServiceNetMap parameter. This patch
adds ctlplane to the output parameters for both
the net_ip_map and net_ip_list_map nested stacks so that
this is possible.

As part of this patch we also split out the NetIpSubnetMap
into its own unique nested stack so that the Heat input
parameters for this stack are more clearly named.

Change-Id: Iaa2dcaebeac896404e87ec0c635688b2a59a9e0f

3 files changed, 51 insertions, 0 deletions

diff --git a/network/ports/net_ip_list_map.yaml b/network/ports/net_ip_list_map.yaml
index 54614ead..257d3f9b 100644
--- a/network/ports/net_ip_list_map.yaml
+++ b/network/ports/net_ip_list_map.yaml
@@ -1,6 +1,9 @@
 heat_template_version: 2015-04-30
 
 parameters:
+  ControlPlaneIpList:
+    default: []
+    type: comma_delimited_list
   ExternalIpList:
     default: []
     type: comma_delimited_list
@@ -23,6 +26,7 @@ outputs:
       A Hash containing a mapping of network names to assigned lists
       of IP addresses.
     value:
+      ctlplane: {get_param: ControlPlaneIpList}
       external: {get_param: ExternalIpList}
       internal_api: {get_param: InternalApiIpList}
       storage: {get_param: StorageIpList}
diff --git a/network/ports/net_ip_map.yaml b/network/ports/net_ip_map.yaml
index edc4060f..7aaed160 100644
--- a/network/ports/net_ip_map.yaml
+++ b/network/ports/net_ip_map.yaml
@@ -1,6 +1,9 @@
 heat_template_version: 2015-04-30
 
 parameters:
+  ControlPlaneIp:
+    default: ''
+    type: string
   ExternalIp:
     default: ''
     type: string
@@ -23,6 +26,7 @@ outputs:
       A Hash containing a mapping of network names to assigned IPs
       for a specific machine.
     value:
+      ctlplane: {get_param: ControlPlaneIp}
       external: {get_param: ExternalIp}
       internal_api: {get_param: InternalApiIp}
       storage: {get_param: StorageIp}
diff --git a/network/ports/net_ip_subnet_map.yaml b/network/ports/net_ip_subnet_map.yaml
new file mode 100644
index 00000000..cf59adb3
--- /dev/null
+++ b/network/ports/net_ip_subnet_map.yaml
@@ -0,0 +1,43 @@
+heat_template_version: 2015-04-30
+
+parameters:
+  ControlPlaneIp:
+    default: ''
+    type: string
+  ExternalIpSubnet:
+    default: ''
+    type: string
+  InternalApiIpSubnet:
+    default: ''
+    type: string
+  StorageIpSubnet:
+    default: ''
+    type: string
+  StorageMgmtIpSubnet:
+    default: ''
+    type: string
+  TenantIpSubnet:
+    default: ''
+    type: string
+  ControlPlaneSubnetCidr: # Override this via parameter_defaults
+    default: '24'
+    description: The subnet CIDR of the control plane network.
+    type: string
+
+outputs:
+  net_ip_subnet_map:
+    description: >
+      A Hash containing a mapping of network names to assigned
+      IP/subnet mappings.
+    value:
+      ctlplane:
+        list_join:
+          - ''
+          - - {get_param: ControlPlaneIp}
+            - '/'
+            - {get_param: ControlPlaneSubnetCidr}
+      external: {get_param: ExternalIpSubnet}
+      internal_api: {get_param: InternalApiIpSubnet}
+      storage: {get_param: StorageIpSubnet}
+      storage_mgmt: {get_param: StorageMgmtIpSubnet}
+      tenant: {get_param: TenantIpSubnet}