diff --git a/defaults/main/ntp.yml b/defaults/main/ntp.yml index dec3ae82..34022562 100644 --- a/defaults/main/ntp.yml +++ b/defaults/main/ntp.yml @@ -1,4 +1,8 @@ --- enable_timesyncd: true -fallback_ntp: 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org -ntp: "0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org" +fallback_ntp: + - 2.ubuntu.pool.ntp.org + - 3.ubuntu.pool.ntp.org +ntp: + - pool.ntp.org + - time.nist.gov diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index ec71b01f..389e4942 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -750,8 +750,8 @@ failed_when: systemd_timesyncd_conf.rc != 0 changed_when: systemd_timesyncd_conf.rc != 0 with_items: - - NTP={{ ntp }} - - FallbackNTP={{ fallback_ntp }} + - NTP={{ ntp | join(' ') }} + - FallbackNTP={{ fallback_ntp | join(' ') }} when: - enable_timesyncd - ansible_virtualization_type not in ["container", "docker", "podman"] diff --git a/templates/etc/systemd/timesyncd.conf.j2 b/templates/etc/systemd/timesyncd.conf.j2 index 8f082621..b74914ec 100644 --- a/templates/etc/systemd/timesyncd.conf.j2 +++ b/templates/etc/systemd/timesyncd.conf.j2 @@ -2,8 +2,8 @@ # Generated by Ansible role {{ ansible_role_name }} [Time] -NTP={{ ntp }} -FallbackNTP={{ fallback_ntp }} +NTP={{ ntp | join(' ') }} +FallbackNTP={{ fallback_ntp | join(' ') }} {% if ansible_local.systemd.version | int >= 236 %} RootDistanceMaxSec=1 {% endif %}