diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-24 00:36:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-24 00:36:01 +0000 |
| commit | bfa407249ed5642ffd3983b13522d8ebaaaa6202 (patch) | |
| tree | fe1d2958e62aff1bfbf69ccf4e09c31f33e57e56 | |
| parent | 7ad4da51a2c22fa2f9c9362b78048099b5804dcc (diff) | |
| parent | 479edff423a3cdcd28beb76aed818071b18b2bf1 (diff) | |
Merge "Replace hardcoded 'br-ex' with NeutronPhysicalBridge parameter."
| -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 7bcee47d..e2cce5fb 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 6a032656..10cfac79 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 320bf991..5ab763ba 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: |