Replacing edpm_chrony with linux-systemroles.timesync

Signed-off-by: Jiri Podivin <[email protected]>
openstack-k8s-operators · Oct 10, 2023 · 582ff7c · 582ff7c
1 parent 7756f5a
commit 582ff7c
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/playbooks/configure_os.yml b/playbooks/configure_os.yml
@@ -29,12 +29,6 @@
         tasks_from: configure.yml
       tags:
         - edpm_sshd
-    - name: Configure edpm_chrony
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_chrony
-        tasks_from: config.yml
-      tags:
-        - edpm_chrony
     - name: Configure edpm_timezone
       ansible.builtin.import_role:
         name: osp.edpm.edpm_timezone

diff --git a/playbooks/install_os.yml b/playbooks/install_os.yml
@@ -4,6 +4,21 @@
   hosts: all
   strategy: linear
   become: true
+  vars:
+    timesync_ntp_servers:
+      - hostname: '0.pool.ntp.org'
+        max_poll: 10
+        min_poll: 6
+      - hostname: '1.pool.ntp.org'
+        max_poll: 10
+        min_poll: 6
+      - hostname: '2.pool.ntp.org'
+        max_poll: 10
+        min_poll: 6
+      - hostname: '3.pool.ntp.org'
+        max_poll: 10
+        min_poll: 6
+    timesync_step_threshold: 1.0
   tasks:
     - name: Install edpm_podman
       ansible.builtin.import_role:
@@ -17,10 +32,17 @@
         tasks_from: install.yml
       tags:
         - edpm_sshd
-    - name: Install edpm_chrony
-      ansible.builtin.import_role:
-        name: osp.edpm.edpm_chrony
-        tasks_from: install.yml
+    - name: Set FQN for the timesync role
+      ansible.builtin.set_fact:
+        timesyncfqn:
+          "{%- if ansible_facts['distribution'] == 'RedHat' -%}
+            redhat.rhel{%- else -%}
+            fedora.linux{%- endif -%}
+          _system_roles.timesync"
+      delegate_to: localhost
+    - name: Install and configure edpm_chrony
+      ansible.builtin.include_role:
+        name: "{{ timesyncfqn }}"
       tags:
         - edpm_chrony
     - name: Install edpm_logrotate_crond

diff --git a/playbooks/run_os.yml b/playbooks/run_os.yml
@@ -11,24 +11,6 @@
         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_timezone
       ansible.builtin.import_role:
         name: osp.edpm.edpm_timezone