Merge "Make all network ports type to consume FixedIPs"

diff --cc network/ports/internal_api.yaml
index b671aa5,711ee17..d528b32
--- 1/network/ports/internal_api.yaml
--- 2/network/ports/internal_api.yaml
+++ b/network/ports/internal_api.yaml
@@@ -14,8 -14,13 +14,14 @@@ parameters
      type: string
    ControlPlaneIP: # Here for compatability with noop.yaml
      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:
  

diff --cc network/ports/storage.yaml
index e1ef8e0,e013619..88fb537
--- 1/network/ports/storage.yaml
--- 2/network/ports/storage.yaml
+++ b/network/ports/storage.yaml
@@@ -14,8 -14,13 +14,14 @@@ parameters
      type: string
    ControlPlaneIP: # Here for compatability with noop.yaml
      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:
  

diff --cc network/ports/storage_mgmt.yaml
index e5b5b88,76afae0..c98a21e
--- 1/network/ports/storage_mgmt.yaml
--- 2/network/ports/storage_mgmt.yaml
+++ b/network/ports/storage_mgmt.yaml
@@@ -14,8 -14,13 +14,14 @@@ parameters
      type: string
    ControlPlaneIP: # Here for compatability with noop.yaml
      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:
  

diff --cc network/ports/tenant.yaml
index 9a351a2,6e8ad48..94408ca
--- 1/network/ports/tenant.yaml
--- 2/network/ports/tenant.yaml
+++ b/network/ports/tenant.yaml
@@@ -14,8 -14,13 +14,14 @@@ parameters
      type: string
    ControlPlaneIP: # Here for compatability with noop.yaml
      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: