Merge "Override ovn::controller::hostname to use hiera:fqdn_canonical" into stable/stein

This commit is contained in:
Zuul 2019-06-20 16:45:14 +00:00 committed by Gerrit Code Review
commit 14f4f239d6

View File

@ -117,6 +117,7 @@ outputs:
params: params:
$NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]} $NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge} ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge}
ovn::controller::hostname: "%{hiera('fqdn_canonical')}"
tripleo::profile::base::neutron::agents::ovn::ovn_db_host: {get_param: [EndpointMap, OvnDbInternal, host_nobrackets]} tripleo::profile::base::neutron::agents::ovn::ovn_db_host: {get_param: [EndpointMap, OvnDbInternal, host_nobrackets]}
tripleo::ovn_controller::firewall_rules: tripleo::ovn_controller::firewall_rules:
'118 neutron vxlan networks': '118 neutron vxlan networks':