Merge "ovn: Provide the option to configure the integration bridge"

This commit is contained in:
Jenkins 2017-10-06 02:12:02 +00:00 committed by Gerrit Code Review
commit 4416428af3

View File

@ -48,6 +48,11 @@ parameters:
scripts or be sure to keep 'datacentre' as a mapping network name.
type: comma_delimited_list
default: "datacentre:br-ex"
OVNIntegrationBridge:
description: >
Name of the OVS bridge to use as integration bridge by OVN Controller.
type: string
default: "br-int"
outputs:
@ -60,6 +65,7 @@ outputs:
ovn::controller::ovn_encap_type: {get_param: OVNTunnelEncapType}
ovn::controller::ovn_encap_ip: {get_param: [ServiceNetMap, NeutronApiNetwork]}
ovn::controller::ovn_bridge_mappings: {get_param: NeutronBridgeMappings}
ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
nova::compute::force_config_drive: true
tripleo.ovn_controller.firewall_rules:
'118 neutron vxlan networks':