diff options
| author |   Dan Sneddon <dsneddon@redhat.com> | 2017-03-01 13:51:08 -0800 |
|---|---|---|
| committer | Dan Sneddon <dsneddon@redhat.com> | 2017-06-23 20:32:37 +0000 |
| commit | 479edff423a3cdcd28beb76aed818071b18b2bf1 (patch) | |
| tree | 0b8ef6e236c5452e7bc1c764106f1c1e1ed8f6e7 | |
| parent | d95394a01c47c46e8ffc3da5e9e4054ffffdc2ee (diff) | |
Replace hardcoded 'br-ex' with NeutronPhysicalBridge parameter.
This change uses the NeutronPhysicalBridge parameter on all roles,
rather than hard-coding the "br-ex" name. Previously, there were
different parameters for controller and compute roles, but since
we use a unified bridge name with OVS, this is unnecessary.
Change-Id: I6d9189404fae67bcc33ddc2ba3ce1b0385dd989d
Closes-bug: 1669130
| -rw-r--r-- | puppet/compute-role.yaml | 2 | ||||
| -rw-r--r-- | puppet/controller-role.yaml | 8 | ||||
| -rw-r--r-- | puppet/role.role.j2.yaml | 8 |
3 files changed, 13 insertions, 5 deletions
diff --git a/puppet/compute-role.yaml b/puppet/compute-role.yaml index 8a3c487a..3dcd7afb 100644 --- a/puppet/compute-role.yaml +++ b/puppet/compute-role.yaml @@ -37,7 +37,7 @@ parameters: type: string NeutronPublicInterface: default: nic1 - description: A port to add to the NeutronPhysicalBridge. + description: Which interface to add to the NeutronPhysicalBridge. type: string NodeIndex: type: number diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index 6bc23669..7d174704 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -58,9 +58,13 @@ parameters: type: string constraints: - custom_constraint: nova.keypair + NeutronPhysicalBridge: + default: 'br-ex' + description: An OVS bridge to create for accessing external networks. + type: string NeutronPublicInterface: default: nic1 - description: What interface to bridge onto br-ex for network nodes. + description: Which interface to add to the NeutronPhysicalBridge. type: string ServiceNetMap: default: {} @@ -431,7 +435,7 @@ resources: - {get_param: NetworkDeploymentActions} - [] input_values: - bridge_name: br-ex + bridge_name: {get_param: NeutronPhysicalBridge} interface_name: {get_param: NeutronPublicInterface} # Resource for site-specific injection of root certificate diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index b7f47594..59a66b69 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -28,9 +28,13 @@ parameters: constraints: - custom_constraint: nova.keypair {% endif %} + NeutronPhysicalBridge: + default: 'br-ex' + description: An OVS bridge to create for accessing tenant networks. + type: string NeutronPublicInterface: default: nic1 - description: What interface to bridge onto br-ex for network nodes. + description: Which interface to add to the NeutronPhysicalBridge. type: string ServiceNetMap: default: {} @@ -409,7 +413,7 @@ resources: server: {get_resource: {{role}}} actions: {get_param: NetworkDeploymentActions} input_values: - bridge_name: br-ex + bridge_name: {get_param: NeutronPhysicalBridge} interface_name: {get_param: NeutronPublicInterface} actions: if: |