diff options
author | 2015-06-04 13:37:05 +0000 | |
---|---|---|
committer | 2015-06-04 13:37:05 +0000 | |
commit | 9a2a5794500636dcaa99bea5dfa6ad62f514fae3 (patch) | |
tree | 81e15370f71e98f6fdcac5c9b6f5d8afbae069df | |
parent | 11c00004416cc6c4e7a49d1542ee180fde03fd2c (diff) | |
parent | a3a88cd3c0c9491877c4278753ac9988a121abbb (diff) |
Merge "Add PortName to ports stacks"
-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: |