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
This commit is contained in:
Oliver Walsh 2018-03-22 12:09:13 +00:00
parent d96f262e74
commit 31e4c0194d
4 changed files with 12 additions and 3 deletions

View File

@ -181,7 +181,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

View File

@ -146,7 +146,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}

View File

@ -290,7 +290,7 @@ outputs:
nova::network::neutron::neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]}
nova::rabbit_heartbeat_timeout_threshold: 60
nova::cinder_catalog_info: 'volumev3:cinderv3: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'

View File

@ -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