diff options
author | Dan Prince <dprince@redhat.com> | 2015-05-29 12:07:44 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2015-06-03 08:58:13 -0400 |
commit | a3a88cd3c0c9491877c4278753ac9988a121abbb (patch) | |
tree | 9fb471ff6e71df17f2bdf5e58f81a10f69d29cb9 | |
parent | ab6d15482f6cfce69fadbb5218bd645ea4f7fdf8 (diff) |
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
-rw-r--r-- | network/ports/external.yaml | 5 | ||||
-rw-r--r-- | network/ports/internal_api.yaml | 5 | ||||
-rw-r--r-- | network/ports/noop.yaml | 4 | ||||
-rw-r--r-- | network/ports/storage.yaml | 5 | ||||
-rw-r--r-- | network/ports/storage_mgmt.yaml | 5 | ||||
-rw-r--r-- | network/ports/tenant.yaml | 5 |
6 files changed, 29 insertions, 0 deletions
diff --git a/network/ports/external.yaml b/network/ports/external.yaml index db86b329..b5c1e5c9 100644 --- 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 59c0e0ad..da1b1856 100644 --- 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 6bbf23c9..80eccf6e 100644 --- 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 27f60a0d..ecb20b8f 100644 --- 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 03cc224e..2ab39f21 100644 --- 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 1957c41b..aae12d46 100644 --- 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: |