Merge pull request #373 from jpodivin/timesync

Replacing edpm_chrony with linux-systemroles.timesync

docs/source/index.rst

@@ -16,6 +16,7 @@ Contents:
    usage
    roles
    plugins
+   playbooks
 
 Indices and tables
 ==================

docs/source/playbooks.rst

@@ -0,0 +1,9 @@
+Playbooks in EDPM-Ansible
+=========================
+
+Contents:
+
+.. toctree::
+   :glob:
+
+   playbooks/*

docs/source/playbooks/install_os.rst

@@ -0,0 +1,19 @@
+=====================
+Playbook - install_os
+=====================
+
+Installs services necessary for the EDPM operation.
+Uses external `timesync` role from `system roles collection`_ to both install and configure chrony.
+
+--------------------------
+Time service configuration
+--------------------------
+
+Variables of the `timesync`_ system role can be overriden in a standard ansible way,
+while respecting resolution order. Default values are set in the `install_os` playbook,
+while allowing for override.
+
+All variables of the timesync role can used while using this playbook.
+
+.. _`system roles collection`: https://linux-system-roles.github.io/
+.. _`timesync`: https://github.com/linux-system-roles/timesync

playbooks/configure_os.yml

@@ -30,6 +30,7 @@
       tags:
         - edpm_sshd
     - name: Configure edpm_chrony
+      when: timesync_ntp_servers is not defined
       ansible.builtin.import_role:
         name: osp.edpm.edpm_chrony
         tasks_from: config.yml

playbooks/install_os.yml

@@ -17,12 +17,29 @@
         tasks_from: install.yml
       tags:
         - edpm_sshd
+    - name: Set up time services
+      when: timesync_ntp_servers is defined
+      block:
+        - name: Set FQCN for the timesync role
+          ansible.builtin.set_fact:
+            timesyncfqcn:
+              "{%- if ansible_facts['distribution'] == 'RedHat' -%}
+                redhat.rhel{%- else -%}
+                fedora.linux{%- endif -%}
+              _system_roles.timesync"
+          delegate_to: localhost
+        - name: Install and configure time service using timesync system role
+          ansible.builtin.include_role:
+            name: "{{timesyncfqcn}}"
+          tags:
+            - dataplane_chrony
     - name: Install edpm_chrony
       ansible.builtin.import_role:
         name: osp.edpm.edpm_chrony
         tasks_from: install.yml
       tags:
         - edpm_chrony
+      when: timesync_ntp_servers is not defined
     - name: Install edpm_logrotate_crond
       ansible.builtin.import_role:
         name: osp.edpm.edpm_logrotate_crond

playbooks/run_os.yml

@@ -11,24 +11,27 @@
         tasks_from: run.yml
       tags:
         - edpm_sshd
-    - name: Run edpm_chrony
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_chrony
-        tasks_from: run.yml
-      tags:
-        - edpm_chrony
-    - name: Run edpm_chrony (Online)
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_chrony
-        tasks_from: online.yml
-      tags:
-        - edpm_chrony
-    - name: Run edpm_chrony (Sync)
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_chrony
-        tasks_from: sync.yml
-      tags:
-        - edpm_chrony
+    - name: Run edpm_chrony role
+      when: timesync_ntp_servers is not defined
+      block:
+        - name: Run edpm_chrony
+          ansible.builtin.import_role:
+            name: osp.edpm.edpm_chrony
+            tasks_from: run.yml
+          tags:
+            - edpm_chrony
+        - name: Run edpm_chrony (Online)
+          ansible.builtin.import_role:
+            name: osp.edpm.edpm_chrony
+            tasks_from: online.yml
+          tags:
+            - edpm_chrony
+        - name: Run edpm_chrony (Sync)
+          ansible.builtin.import_role:
+            name: osp.edpm.edpm_chrony
+            tasks_from: sync.yml
+          tags:
+            - edpm_chrony
     - name: Run edpm_timezone
       ansible.builtin.import_role:
         name: osp.edpm.edpm_timezone