openstack/tripleo-heat-templates
Code Issues Proposed changes

Override ovn::controller::hostname to use hiera:fqdn_canonical

Browse Source 
ovn::controller::hostname defaults to ::fqdn,
hostname can differ based on how nova configures it, detected
when dhcp_domain name is removed in [1].
So it's good to rely on fqdn_canonical hiera key which
nova also relies on to set "host" in nova.conf.

Also use neutron_timeout instead of neutron_url_timeout
which was deprecated for long and is removed in [1].

[1] https://review.opendev.org/#/c/658400/

Related-Bug: #1829993
Change-Id: If52302b5a04b5e146ac53ccd3fc65a064b2df2fb
This commit is contained in:
yatinkarel 2019-05-22 11:08:12 +05:30
parent 45a94c8710
commit 5e83eeda5b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/ovn/ovn-controller-container-puppet.yaml
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')}"
nova::compute::force_config_drive: {if: [force_config_drive, true, false]} nova::compute::force_config_drive: {if: [force_config_drive, true, false]}
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:

2
environments/low-memory-usage.yaml
View File

@ -16,7 +16,7 @@ parameter_defaults:
ApacheServerLimit: 100 ApacheServerLimit: 100
ControllerExtraConfig: ControllerExtraConfig:
'nova::network::neutron::neutron_url_timeout': '60' 'nova::network::neutron::neutron_timeout': '60'
DatabaseSyncTimeout: 900 DatabaseSyncTimeout: 900