Update to 2024-09-23 23:00

roles/ntp_client/tasks/conf.yml

@@ -0,0 +1,28 @@
+---
+
+- when:
+    - ansible_virtualization_role == 'guest'
+    - ansible_virtualization_type == 'kvm'
+  block:
+    - name: Configure ptp_kvm to be loaded
+      copy: content=ptp_kvm dest=/etc/modules-load.d/ptp_kvm.conf
+      register: ntp_ptp_kvm_mod
+    
+    - name: Load ptp_kvm
+      service: name=systemd-modules-load state=restarted
+      when: ntp_ptp_kvm_mod.changed
+  tags: ntp
+
+- when: ansible_virtualization_role != 'guest' or ansible_virtualization_type != 'kvm'
+  file: path=/etc/modules-load.d/ptp_kvm.conf state=absent
+  tags: ntp
+
+- name: Check if /dev/ptp_kvm exists
+  stat: path=/dev/ptp_kvm
+  register: ntp_ptp_kvm_dev
+  tags: ntp
+
+- name: Deploy chrony configuration
+  template: src=chrony.conf.j2 dest={{ ntp_chrony_conf }}
+  notify: restart chrony
+  tags: ntp

roles/ntp_client/tasks/facts.yml

@@ -0,0 +1,19 @@
+---
+
+- include_vars: "{{ item }}"
+  with_first_found:
+    - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml
+    - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml
+    - vars/{{ ansible_distribution }}.yml
+    - vars/{{ ansible_os_family }}.yml
+  tags: ntp
+
+- name: Check if systemd-timesyncd is available
+  stat: path=/lib/systemd/systemd-timesyncd
+  register: systemd_timesyncd
+  tags: ntp
+
+- name: Check if ntpd is installed
+  stat: path=/lib/systemd/system/{{ ntp_ntpd_service }}.service
+  register: ntp_unit
+  tags: ntp

roles/ntp_client/tasks/install.yml

@@ -0,0 +1,17 @@
+---
+
+  # If systemd-timesyncd is installed, stop and disable it
+- name: Disable systemd-timesyncd
+  service: name=systemd-timesyncd state=stopped enabled=False
+  when: systemd_timesyncd.stat.exists
+  tags: ntp
+
+  # If ntpd is installed, stop and disable it
+- name: Handle ntpd service
+  service: name={{ ntp_ntpd_service }} state=stopped enabled=False
+  when: ntp_unit.stat.exists
+  tags: ntp
+
+- name: Install Chrony
+  package: name=chrony
+  tags: ntp

roles/ntp_client/tasks/main.yml

@@ -1,53 +1,14 @@
 ---
 
-- include_vars: "{{ item }}"
-  with_first_found:
-    - vars/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml
-    - vars/{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml
-    - vars/{{ ansible_distribution }}.yml
-    - vars/{{ ansible_os_family }}.yml
-  tags: ntp
+- include_tasks: facts.yml
+  tags: always
 
-- name: Check if systemd-timesyncd is available
-  stat: path=/lib/systemd/systemd-timesyncd
-  register: systemd_timesyncd
-  tags: ntp
+- include_tasks: install.yml
+  tags: always
 
-- name: Disable systemd-timesyncd
-  service: name=systemd-timesyncd state=stopped enabled=False
-  when: systemd_timesyncd.stat.exists
-  tags: ntp
+- include_tasks: conf.yml
+  tags: always
 
-- name: Install Chrony
-  package: name=chrony
-  tags: ntp
-
-- name: Deploy chrony configuration
-  template: src=chrony.conf.j2 dest={{ ntp_chrony_conf }}
-  notify: restart chrony
-  tags: ntp
-
-  # Always close port, it's only used as a server on samba DC, where port 123 is opened
-  # by the samba role
-- name: Handle ntpd port
-  iptables_raw:
-    name: ntpd_port
-    state: absent
-  when: iptables_manage | default(True)
-  tags: ntp
-
-- name: Check if ntpd is installed
-  stat: path=/lib/systemd/system/{{ ntp_ntpd_service }}.service
-  register: ntp_unit
-  tags: ntp
-
-  # If ntpd is installed, stop and disable it
-- name: Handle ntpd service
-  service: name={{ ntp_ntpd_service }} state=stopped enabled=False
-  when: ntp_unit.stat.exists
-  tags: ntp
-
-- name: Start and enable chrony
-  service: name={{ ntp_chrony_service }} state=started enabled=True
-  tags: ntp
+- include_tasks: services.yml
+  tags: always
 

roles/ntp_client/tasks/services.yml

@@ -0,0 +1,5 @@
+---
+
+- name: Start and enable chrony
+  service: name={{ ntp_chrony_service }} state=started enabled=True
+  tags: ntp