diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index 2876fb9f8a..07dd38b31a 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/deployment/ovn/ovn-controller-container-puppet.yaml @@ -117,6 +117,7 @@ outputs: params: $NETWORK: {get_param: [ServiceNetMap, NeutronTenantNetwork]} ovn::controller::ovn_bridge: {get_param: OVNIntegrationBridge} + ovn::controller::hostname: "%{hiera('fqdn_canonical')}" 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::ovn_controller::firewall_rules: diff --git a/environments/low-memory-usage.yaml b/environments/low-memory-usage.yaml index f9af073a02..5cb9608a1d 100644 --- a/environments/low-memory-usage.yaml +++ b/environments/low-memory-usage.yaml @@ -16,7 +16,7 @@ parameter_defaults: ApacheServerLimit: 100 ControllerExtraConfig: - 'nova::network::neutron::neutron_url_timeout': '60' + 'nova::network::neutron::neutron_timeout': '60' DatabaseSyncTimeout: 900