Merge "Use 'NeutronTenantNetwork' instead of 'NeutronApiNetwork' for ovn-encap-ip"

This commit is contained in:
Zuul 2017-11-14 01:38:39 +00:00 committed by Gerrit Code Review
commit 2f12c9c750

View File

@ -63,7 +63,7 @@ outputs:
config_settings:
ovn::southbound::port: {get_param: OVNSouthboundServerPort}
ovn::controller::ovn_encap_type: {get_param: OVNTunnelEncapType}
ovn::controller::ovn_encap_ip: {get_param: [ServiceNetMap, NeutronApiNetwork]}
ovn::controller::ovn_encap_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
ovn::controller::ovn_bridge_mappings: {get_param: NeutronBridgeMappings}
ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
nova::compute::force_config_drive: true