1 files changed, 40 insertions, 1 deletions
diff --git a/network/ports/net_ip_map.yaml b/network/ports/net_ip_map.yaml
index 6bb4557b..78c7c32c 100644
--- a/network/ports/net_ip_map.yaml
+++ b/network/ports/net_ip_map.yaml
@@ -4,9 +4,16 @@ parameters:
   ControlPlaneIp:
     default: ''
     type: string
+  ControlPlaneSubnetCidr: # Override this via parameter_defaults
+    default: '24'
+    description: The subnet CIDR of the control plane network.
+    type: string
   ExternalIp:
     default: ''
     type: string
+  ExternalIpSubnet:
+    default: ''
+    type: string
   ExternalIpUri:
     default: ''
     type: string
@@ -14,6 +21,9 @@ parameters:
   InternalApiIp:
     default: ''
     type: string
+  InternalApiIpSubnet:
+    default: ''
+    type: string
   InternalApiIpUri:
     default: ''
     type: string
@@ -21,6 +31,9 @@ parameters:
   StorageIp:
     default: ''
     type: string
+  StorageIpSubnet:
+    default: ''
+    type: string
   StorageIpUri:
     default: ''
     type: string
@@ -28,6 +41,9 @@ parameters:
   StorageMgmtIp:
     default: ''
     type: string
+  StorageMgmtIpSubnet:
+    default: ''
+    type: string
   StorageMgmtIpUri:
     default: ''
     type: string
@@ -35,6 +51,9 @@ parameters:
   TenantIp:
     default: ''
     type: string
+  TenantIpSubnet:
+    default: ''
+    type: string
   TenantIpUri:
     default: ''
     type: string
@@ -42,6 +61,9 @@ parameters:
   ManagementIp:
     default: ''
     type: string
+  ManagementIpSubnet:
+    default: ''
+    type: string
   ManagementIpUri:
     default: ''
     type: string
@@ -60,9 +82,26 @@ outputs:
       storage_mgmt: {get_param: StorageMgmtIp}
       tenant: {get_param: TenantIp}
       management: {get_param: ManagementIp}
+  net_ip_subnet_map:
+    description: >
+      A Hash containing a mapping of network names to assigned IPs/CIDR
+      for a specific machine.
+    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}
+      management: {get_param: ManagementIpSubnet}
   net_ip_uri_map:
     description: >
-      A Hash containing a mapping of netowrk names to assigned IPs for a
+      A Hash containing a mapping of network names to assigned IPs for a
       specific machine with brackets around IPv6 addresses for use in URLs.
     value:
       ctlplane: {get_param: ControlPlaneIp}