From 90d3723175deca490e53019dfb10c066863fa7cb Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 3 Dec 2018 20:20:49 -0700 Subject: [PATCH] Specify multiple NtpServers by default The NtpServer default set now includes multiple pool.ntp.org hosts to ensure that the time can be properly synced during the deployment. Having only a single timesource can lead to deployment failures if the time source is unavailable during the deployment. It is recommended that you either set multiple NtpServers or use the NtpPool configuration to ensure that enough time sources are available for the hosts. Note that the NtpPool configuration is only available when using chrony. Change-Id: I5b82d77cbf0f2e8c2a59645a72aa533d7d2c86b8 Closes-Bug: #1806521 --- deployment/timesync/chrony-ansible.yaml | 6 +++--- environments/composable-roles/monolithic-ha.yaml | 4 ++-- environments/composable-roles/monolithic-nonha.yaml | 4 ++-- environments/composable-roles/standalone.yaml | 4 ++-- environments/standalone/standalone-overcloud.yaml | 4 ++-- environments/standalone/standalone-tripleo.yaml | 4 ++-- puppet/services/time/ntp.yaml | 6 +++--- .../change-ntp-default-servers-5c4cb51c10ffe60e.yaml | 10 ++++++++++ 8 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 releasenotes/notes/change-ntp-default-servers-5c4cb51c10ffe60e.yaml diff --git a/deployment/timesync/chrony-ansible.yaml b/deployment/timesync/chrony-ansible.yaml index f11a4f7db4..444da4b048 100644 --- a/deployment/timesync/chrony-ansible.yaml +++ b/deployment/timesync/chrony-ansible.yaml @@ -34,9 +34,9 @@ parameters: via parameter_defaults in the resource registry. type: json NtpServer: - default: ['pool.ntp.org'] - description: NTP servers list. Defaulted to pool.ntp.org in order to - have a sane default for Pacemaker deployments when + default: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'] + description: NTP servers list. Defaulted to a set of pool.ntp.org servers + in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. type: comma_delimited_list NtpPool: diff --git a/environments/composable-roles/monolithic-ha.yaml b/environments/composable-roles/monolithic-ha.yaml index bb8a532a62..b60992777e 100644 --- a/environments/composable-roles/monolithic-ha.yaml +++ b/environments/composable-roles/monolithic-ha.yaml @@ -41,9 +41,9 @@ parameter_defaults: # Type: comma_delimited_list DnsServers: [] - # NTP servers list. Defaulted to pool.ntp.org in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. + # NTP servers list. Defaulted to a set of pool.ntp.org servers in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. # Type: comma_delimited_list - NtpServer: ['pool.ntp.org'] + NtpServer: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'] # Name of the flavor for Ceph nodes # Type: string diff --git a/environments/composable-roles/monolithic-nonha.yaml b/environments/composable-roles/monolithic-nonha.yaml index 17700820d9..79177c8285 100644 --- a/environments/composable-roles/monolithic-nonha.yaml +++ b/environments/composable-roles/monolithic-nonha.yaml @@ -41,9 +41,9 @@ parameter_defaults: # Type: comma_delimited_list DnsServers: [] - # NTP servers list. Defaulted to pool.ntp.org in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. + # NTP servers list. Defaulted to a set of pool.ntp.org servers in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. # Type: comma_delimited_list - NtpServer: ['pool.ntp.org'] + NtpServer: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'] # Name of the flavor for Ceph nodes # Type: string diff --git a/environments/composable-roles/standalone.yaml b/environments/composable-roles/standalone.yaml index 1fdb711f73..543d409cf3 100644 --- a/environments/composable-roles/standalone.yaml +++ b/environments/composable-roles/standalone.yaml @@ -54,9 +54,9 @@ parameter_defaults: # Type: number NetworkerCount: 2 - # NTP servers list. Defaulted to pool.ntp.org in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. + # NTP servers list. Defaulted to a set of pool.ntp.org servers in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. # Type: comma_delimited_list - NtpServer: ['pool.ntp.org'] + NtpServer: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'] # Name of the flavor for Ceph nodes # Type: string diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml index 6cbdc6461e..926e304f1b 100644 --- a/environments/standalone/standalone-overcloud.yaml +++ b/environments/standalone/standalone-overcloud.yaml @@ -26,9 +26,9 @@ parameter_defaults: # Type: comma_delimited_list DnsServers: [] - # NTP servers list. Defaulted to pool.ntp.org in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. + # NTP servers list. Defaulted to a set of pool.ntp.org servers in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. # Type: comma_delimited_list - NtpServer: ['pool.ntp.org'] + NtpServer: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'] # Name of the flavor for Standalone nodes # Type: string diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index 4542ee44d9..e24997fc46 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -36,9 +36,9 @@ parameter_defaults: # Type: boolean EnablePackageInstall: True - # NTP servers list. Defaulted to pool.ntp.org in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. + # NTP servers list. Defaulted to a set of pool.ntp.org servers in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. # Type: comma_delimited_list - NtpServer: ['pool.ntp.org'] + NtpServer: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'] # How the server should receive the metadata required for software configuration. # Type: string diff --git a/puppet/services/time/ntp.yaml b/puppet/services/time/ntp.yaml index bf3a06ad29..c7b2415670 100644 --- a/puppet/services/time/ntp.yaml +++ b/puppet/services/time/ntp.yaml @@ -34,9 +34,9 @@ parameters: via parameter_defaults in the resource registry. type: json NtpServer: - default: ['pool.ntp.org'] - description: NTP servers list. Defaulted to pool.ntp.org in order to - have a sane default for Pacemaker deployments when + default: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'] + description: NTP servers list. Defaulted to a set of pool.ntp.org servers + in order to have a sane default for Pacemaker deployments when not configuring this parameter by default. type: comma_delimited_list NtpIburstEnable: diff --git a/releasenotes/notes/change-ntp-default-servers-5c4cb51c10ffe60e.yaml b/releasenotes/notes/change-ntp-default-servers-5c4cb51c10ffe60e.yaml new file mode 100644 index 0000000000..95384f47fb --- /dev/null +++ b/releasenotes/notes/change-ntp-default-servers-5c4cb51c10ffe60e.yaml @@ -0,0 +1,10 @@ +--- +fixes: + - | + The NtpServer default set now includes multiple pool.ntp.org hosts to ensure + that the time can be properly synced during the deployment. Having only a + single timesource can lead to deployment failures if the time source is + unavailable during the deployment. It is recommended that you either + set multiple NtpServers or use the NtpPool configuration to ensure that + enough time sources are available for the hosts. Note that the NtpPool + configuration is only available when using chrony. See LP#1806521