From c48ae0b42f06dacd8615ef52f718674ec95c12af Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Thu, 22 Mar 2018 12:09:13 +0000 Subject: [PATCH] Explicitly set nova/neutron/ceilometer host to expected fqdn This avoids any issues where the host/domainname is altered by a DHCP lease. Also the puppet/facter fqdn can be unpredictable when there are multiple NICs. Change-Id: I7ed52727d1515ee7f191a82b0b1d645a9d597cd3 Closes-bug: 1758034 (cherry picked from commit 31e4c0194dd1d6e049a728c876347df93ce89908) (cherry picked from commit 3381d59f0a6bafac47c98ed8754ee4170e749354) --- puppet/services/ceilometer-base.yaml | 2 +- puppet/services/neutron-base.yaml | 2 +- puppet/services/nova-base.yaml | 2 +- releasenotes/notes/fix_nova_host-0b82c88597703353.yaml | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/fix_nova_host-0b82c88597703353.yaml diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index deb00f1a2a..9b17043bf3 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -169,7 +169,7 @@ outputs: ceilometer::telemetry_secret: {get_param: CeilometerMeteringSecret} ceilometer::snmpd_readonly_username: {get_param: SnmpdReadonlyUserName} ceilometer::snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword} - ceilometer::host: '%{::fqdn}' + ceilometer::host: "%{hiera('fqdn_canonical')}" service_config_settings: keystone: ceilometer_auth_enabled: true diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 9e493c3e64..4fa5c396b2 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -140,7 +140,7 @@ outputs: neutron::dhcp_agent_notification: {get_param: DhcpAgentNotification} neutron::dns_domain: {get_param: NeutronDnsDomain} neutron::rabbit_heartbeat_timeout_threshold: 60 - neutron::host: '%{::fqdn}' + neutron::host: "%{hiera('fqdn_canonical')}" neutron::db::database_db_max_retries: -1 neutron::db::database_max_retries: -1 neutron::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout} diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 0c7f7ce508..05ca60e358 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -224,7 +224,7 @@ outputs: nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]} nova::rabbit_heartbeat_timeout_threshold: 60 nova::cinder_catalog_info: 'volumev2:cinderv2:internalURL' - nova::host: '%{::fqdn}' + nova::host: "%{hiera('fqdn_canonical')}" nova::notify_on_state_change: 'vm_and_task_state' nova::notification_driver: {get_param: NotificationDriver} nova::notification_format: 'unversioned' diff --git a/releasenotes/notes/fix_nova_host-0b82c88597703353.yaml b/releasenotes/notes/fix_nova_host-0b82c88597703353.yaml new file mode 100644 index 0000000000..7430490e0f --- /dev/null +++ b/releasenotes/notes/fix_nova_host-0b82c88597703353.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + The nova/neutron/ceilometer host parameter is now explicitly set to the + same value that is written to /etc/hosts. On a correctly configured + deployment they should be already be identical. However if the hostname + or domainname is altered (e.g via DHCP) then the hostname is unlikely to + resolve to the correct IP address for live-migraiton. + Related bug: https://bugs.launchpad.net/tripleo/+bug/1758034