diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-07-08 19:28:32 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-07-08 19:28:32 +0000 |
commit | 6ebaadb30c3cabaae232f42306903f28627a784c (patch) | |
tree | bafaed8edbf84845e01653b9cc3c01d6c9401b67 /puppet/controller-puppet.yaml | |
parent | 82f04ec310fe9d4f99e46077bb1c6e439187c7ed (diff) | |
parent | e3cd6284fb62a04e0dcb7a144433cf1e27af7fd7 (diff) |
Merge "Add NeutronExternalNetworkBridge parameter"
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r-- | puppet/controller-puppet.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index f4eab68a..49defa9d 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -262,6 +262,10 @@ parameters: type: string hidden: true default: '' # Has to be here because of the ignored empty value bug + NeutronExternalNetworkBridge: + description: Name of bridge used for external network traffic. + type: string + default: 'br-ex' NeutronBridgeMappings: description: > The OVS logical->physical bridge mappings to use. See the Neutron @@ -697,6 +701,7 @@ resources: - "','" - {get_param: NeutronNetworkVLANRanges} neutron_bridge_mappings: {get_param: NeutronBridgeMappings} + neutron_external_network_bridge: {get_param: NeutronExternalNetworkBridge} neutron_public_interface: {get_param: NeutronPublicInterface} neutron_public_interface_raw_device: {get_param: NeutronPublicInterfaceRawDevice} neutron_public_interface_default_route: {get_param: NeutronPublicInterfaceDefaultRoute} @@ -957,6 +962,7 @@ resources: neutron::server::auth_uri: {get_input: keystone_auth_uri} neutron::server::identity_uri: {get_input: keystone_identity_uri} neutron::server::database_connection: {get_input: neutron_dsn} + neutron::agents::l3::external_network_bridge: {get_input: neutron_external_network_bridge} neutron::agents::ml2::ovs::enable_tunneling: {get_input: neutron_enable_tunneling} neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip} neutron_flat_networks: {get_input: neutron_flat_networks} |