Add PortName to ports stacks

For VIP ports we set an explicit name on the ports. This
patch adds an optional PortName parameter to the ports
objects which can be used to specify a name.

Change-Id: Iad0f5e4cfc31a931dbb574d9e589570125e9465c

diff --git a/network/ports/external.yaml b/network/ports/external.yaml
index db86b32..b5c1e5c 100644 (file)
--- a/network/ports/external.yaml
+++ b/network/ports/external.yaml
@@ -8,6 +8,10 @@ parameters:
     description: Name of the external neutron network
     default: external
     type: string
+  PortName:
+    description: Name of the port
+    default: ''
+    type: string
   ControlPlaneIP: # Here for compatability with noop.yaml
     description: IP address on the control plane
     type: string
@@ -18,6 +22,7 @@ resources:
     type: OS::Neutron::Port
     properties:
       network: {get_param: ExternalNetName}
+      name: {get_param: PortName}
       replacement_policy: AUTO
 
 outputs:

diff --git a/network/ports/internal_api.yaml b/network/ports/internal_api.yaml
index 59c0e0a..da1b185 100644 (file)
--- a/network/ports/internal_api.yaml
+++ b/network/ports/internal_api.yaml
@@ -8,6 +8,10 @@ parameters:
     description: Name of the internal API neutron network
     default: internal_api
     type: string
+  PortName:
+    description: Name of the port
+    default: ''
+    type: string
   ControlPlaneIP: # Here for compatability with noop.yaml
     description: IP address on the control plane
     type: string
@@ -18,6 +22,7 @@ resources:
     type: OS::Neutron::Port
     properties:
       network: {get_param: InternalApiNetName}
+      name: {get_param: PortName}
       replacement_policy: AUTO
 
 outputs:

diff --git a/network/ports/noop.yaml b/network/ports/noop.yaml
index 6bbf23c..80eccf6 100644 (file)
--- a/network/ports/noop.yaml
+++ b/network/ports/noop.yaml
@@ -7,6 +7,10 @@ parameters:
   ControlPlaneIP:
     description: IP address on the control plane
     type: string
+  PortName:
+    description: Name of the port
+    default: ''
+    type: string
   ControlPlaneSubnetCidr: # Override this via parameter_defaults
     default: '24'
     description: The subnet CIDR of the control plane network.

diff --git a/network/ports/storage.yaml b/network/ports/storage.yaml
index 27f60a0..ecb20b8 100644 (file)
--- a/network/ports/storage.yaml
+++ b/network/ports/storage.yaml
@@ -8,6 +8,10 @@ parameters:
     description: Name of the storage neutron network
     default: storage
     type: string
+  PortName:
+    description: Name of the port
+    default: ''
+    type: string
   ControlPlaneIP: # Here for compatability with noop.yaml
     description: IP address on the control plane
     type: string
@@ -18,6 +22,7 @@ resources:
     type: OS::Neutron::Port
     properties:
       network: {get_param: StorageNetName}
+      name: {get_param: PortName}
       replacement_policy: AUTO
 
 outputs:

diff --git a/network/ports/storage_mgmt.yaml b/network/ports/storage_mgmt.yaml
index 03cc224..2ab39f2 100644 (file)
--- a/network/ports/storage_mgmt.yaml
+++ b/network/ports/storage_mgmt.yaml
@@ -8,6 +8,10 @@ parameters:
     description: Name of the storage_mgmt API neutron network
     default: storage_mgmt
     type: string
+  PortName:
+    description: Name of the port
+    default: ''
+    type: string
   ControlPlaneIP: # Here for compatability with noop.yaml
     description: IP address on the control plane
     type: string
@@ -18,6 +22,7 @@ resources:
     type: OS::Neutron::Port
     properties:
       network: {get_param: StorageMgmtNetName}
+      name: {get_param: PortName}
       replacement_policy: AUTO
 
 outputs:

diff --git a/network/ports/tenant.yaml b/network/ports/tenant.yaml
index 1957c41..aae12d4 100644 (file)
--- a/network/ports/tenant.yaml
+++ b/network/ports/tenant.yaml
@@ -8,6 +8,10 @@ parameters:
     description: Name of the tenant neutron network
     default: tenant
     type: string
+  PortName:
+    description: Name of the port
+    default: ''
+    type: string
   ControlPlaneIP: # Here for compatability with noop.yaml
     description: IP address on the control plane
     type: string
@@ -18,6 +22,7 @@ resources:
     type: OS::Neutron::Port
     properties:
       network: {get_param: TenantNetName}
+      name: {get_param: PortName}
       replacement_policy: AUTO
 
 outputs: