From 9baecd0573ba7b853b526250dd8967504197dcdb Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Fri, 9 Nov 2018 11:19:57 -0700 Subject: [PATCH] Move default values to defaults The os specific variables are overriding the provided vars so we should only define things that should not be overridable because they are OS specific (service names, config file locations, etc) Change-Id: I2af49137d91c34eeb68353d7438a5ee09c8166c9 Closes-Bug: #1802538 --- defaults/main.yml | 3 ++- vars/RedHat.yml | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index de10143..8336c9c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,8 +1,9 @@ --- chrony_debug: False chrony_role_action: install +chrony_global_server_settings: iburst chrony_ntp_servers: [] -chrony_ntp_pools: [] +chrony_ntp_pools: ['pool.ntp.org'] chrony_ntp_peers: [] chrony_bind_addresses: - 127.0.0.1 diff --git a/vars/RedHat.yml b/vars/RedHat.yml index 7d33baa..804eda7 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -1,12 +1,6 @@ --- chrony_package_name: chrony chrony_service_name: chronyd -chrony_ntp_servers: - - 0.rhel.pool.ntp.org - - 1.rhel.pool.ntp.org - - 2.rhel.pool.ntp.org - - 3.rhel.pool.ntp.org -chrony_global_server_settings: iburst chrony_config_file_location: /etc/chrony.conf chrony_driftfile_path: /var/lib/chrony/drift chrony_logdir_path: /var/log/chrony