From 479edff423a3cdcd28beb76aed818071b18b2bf1 Mon Sep 17 00:00:00 2001 From: Dan Sneddon Date: Wed, 1 Mar 2017 13:51:08 -0800 Subject: 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 --- puppet/role.role.j2.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'puppet/role.role.j2.yaml') 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: -- cgit 1.2.3-korg