From 92285fdbfe7363b4e39d4f284e9773be8e5ee51e Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Fri, 9 Nov 2018 10:45:29 -0700
Subject: [PATCH] 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
---
 deployment/timesync/chrony-ansible.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/deployment/timesync/chrony-ansible.yaml b/deployment/timesync/chrony-ansible.yaml
index 9b2af857f4..378b02028f 100644
--- a/deployment/timesync/chrony-ansible.yaml
+++ b/deployment/timesync/chrony-ansible.yaml
@@ -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: