Merge "Make all network ports type to consume FixedIPs"

network/ports/internal_api.yaml

@@ -16,6 +16,12 @@ parameters:
     description: IP address on the control plane
     default: ''
     type: string
+  FixedIPs:
+    description: >
+        Control the IP allocation for the VIP port. E.g.
+        [{'ip_address':'1.2.3.4'}]
+    default: []
+    type: json
 
 resources:
 
@@ -24,6 +30,7 @@ resources:
     properties:
       network: {get_param: InternalApiNetName}
       name: {get_param: PortName}
+      fixed_ips: {get_param: FixedIPs}
       replacement_policy: AUTO
 
 outputs:

network/ports/storage.yaml

@@ -16,6 +16,12 @@ parameters:
     description: IP address on the control plane
     default: ''
     type: string
+  FixedIPs:
+    description: >
+        Control the IP allocation for the VIP port. E.g.
+        [{'ip_address':'1.2.3.4'}]
+    default: []
+    type: json
 
 resources:
 
@@ -24,6 +30,7 @@ resources:
     properties:
       network: {get_param: StorageNetName}
       name: {get_param: PortName}
+      fixed_ips: {get_param: FixedIPs}
       replacement_policy: AUTO
 
 outputs:

network/ports/storage_mgmt.yaml

@@ -16,6 +16,12 @@ parameters:
     description: IP address on the control plane
     default: ''
     type: string
+  FixedIPs:
+    description: >
+        Control the IP allocation for the VIP port. E.g.
+        [{'ip_address':'1.2.3.4'}]
+    default: []
+    type: json
 
 resources:
 
@@ -24,6 +30,7 @@ resources:
     properties:
       network: {get_param: StorageMgmtNetName}
       name: {get_param: PortName}
+      fixed_ips: {get_param: FixedIPs}
       replacement_policy: AUTO
 
 outputs:

network/ports/tenant.yaml

@@ -16,6 +16,12 @@ parameters:
     description: IP address on the control plane
     default: ''
     type: string
+  FixedIPs:
+    description: >
+        Control the IP allocation for the VIP port. E.g.
+        [{'ip_address':'1.2.3.4'}]
+    default: []
+    type: json
 
 resources:
 
@@ -24,6 +30,7 @@ resources:
     properties:
       network: {get_param: TenantNetName}
       name: {get_param: PortName}
+      fixed_ips: {get_param: FixedIPs}
       replacement_policy: AUTO
 
 outputs: