attempt to resolve ubuntu issues

ericsysmin · Mar 11, 2024 · 48ce6e3 · 48ce6e3
1 parent 6441dfe
commit 48ce6e3
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/chrony.yml b/.github/workflows/chrony.yml
@@ -22,9 +22,9 @@ jobs:
       matrix:
         molecule_distro:
           - { distro: centos-8, command: /usr/sbin/init }
-          # - {distro: ubuntu-18.04, command: /lib/systemd/systemd}
-          # - {distro: ubuntu-20.04, command: /lib/systemd/systemd}
-          # - {distro: debian-10, command: /lib/systemd/systemd}
+          - {distro: ubuntu-18.04, command: /lib/systemd/systemd}
+          - {distro: ubuntu-20.04, command: /lib/systemd/systemd}
+          - {distro: debian-10, command: /lib/systemd/systemd}
         collection_role:
           - chrony
     steps:

diff --git a/roles/chrony/templates/chrony.conf.j2 b/roles/chrony/templates/chrony.conf.j2
@@ -2,7 +2,7 @@
 
 # List of NTP servers to use.
 {% for server in chrony_config_server %}
-server {{ server }} iburst
+{{ chrony_server_param }} {{ server }} iburst
 {% endfor %}
 
 # This directive specify the location of the file containing ID/key pairs for

diff --git a/roles/chrony/vars/archlinux.yml b/roles/chrony/vars/archlinux.yml
@@ -5,3 +5,4 @@ chrony_service_name: chronyd
 chrony_config_location: /etc/chrony.conf
 chrony_config_driftfile: /var/lib/chrony/drift
 chrony_config_keyfile: /etc/chrony.keys
+chrony_server_param: server
diff --git a/roles/chrony/vars/debian.yml b/roles/chrony/vars/debian.yml
@@ -5,3 +5,4 @@ chrony_service_name: chrony
 chrony_config_location: /etc/chrony/chrony.conf
 chrony_config_driftfile: /var/lib/chrony/chrony.drift
 chrony_config_keyfile: /etc/chrony/chrony.keys
+chrony_server_param: pool
diff --git a/roles/chrony/vars/redhat.yml b/roles/chrony/vars/redhat.yml
@@ -5,3 +5,4 @@ chrony_service_name: chronyd
 chrony_config_location: /etc/chrony.conf
 chrony_config_driftfile: /var/lib/chrony/drift
 chrony_config_keyfile: /etc/chrony.keys
+chrony_server_param: server
diff --git a/roles/chrony/vars/suse.yml b/roles/chrony/vars/suse.yml
@@ -5,3 +5,4 @@ chrony_service_name: chronyd
 chrony_config_location: /etc/chrony.conf
 chrony_config_driftfile: /var/lib/chrony/drift
 chrony_config_keyfile: /etc/chrony.keys
+chrony_server_param: server