openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Do not ignore NtpServer by default 

Before we had the NtpPool option which has been added because of chrony,
the NtpServer parameter was the way to configure the ntp sources for
TripleO. We should not ignore them because this can break people coming
from previous versions.

Change-Id: I09c08740a3bd9b64950430496fecdae903bb6ebc
Closes-Bug: #1802538
This commit is contained in:
Alex Schultz 2018-11-09 10:45:29 -07:00
parent 6669b10a38
commit 92285fdbfe
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/timesync/chrony-ansible.yaml
View File

@ -98,7 +98,6 @@ parameters:
conditions:
chrony_global_server_settings_is_empty: {equals: [{get_param: ChronyGlobalServerOptions}, '']}
chrony_global_pool_settings_is_empty: {equals: [{get_param: ChronyGlobalPoolOptions}, '']}
chrony_pool_is_empty: {equals: [{get_param: NtpPool}, []]}
ntp_iburst: {equals: [{get_param: NtpIburstEnable}, true]}
outputs:
@ -128,11 +127,7 @@ outputs:
command: chronyc waitsync 20
ansible_group_vars:
chrony_role_action: all
chrony_ntp_servers:
if:
- chrony_pool_is_empty
- {get_param: NtpServer}
- []
chrony_ntp_servers: {get_param: NtpServer}
chrony_ntp_pools: {get_param: NtpPool}
chrony_global_server_settings:
if: