Merge branch 'ntp_client' into 'newinfra'

[ntp-client] On continue à PEPCRANSIFIER

See merge request nounous/ansible!194

group_vars/server/ntp.yml

@@ -0,0 +1,3 @@
+glob_ntp_client:
+  servers:
+    - charybde.adm.crans.org

hosts

@@ -76,6 +76,10 @@ fluxx.adm.crans.org
 [nginx:children]
 reverseproxy
 
+[ntp_server]
+charybde.adm.crans.org
+# silice.adm.crans.org
+
 [postfix]
 mailman.adm.crans.org
 redisdead.adm.crans.org

plays/root.yml

@@ -33,10 +33,7 @@
     # # Will be in /usr/scripts/
     # crans_scripts_git: "http://gitlab.adm.crans.org/nounous/scripts.git"
 
-    # NTP servers
+    ntp_client: '{{ glob_ntp_client | combine(loc_ntp_client | default({})) }}'
-    ntp_servers:
-      - charybde.adm.crans.org
-    #   - silice.adm.crans.org
   roles:
     - debian-apt-sources
     - common-tools

roles/ntp-client/tasks/main.yml

@@ -7,12 +7,11 @@
   register: apt_result
   retries: 3
   until: apt_result is succeeded
-  when: inventory_hostname not in ntp_servers
+  when: "'ntp_server' not in group_names"
 
 - name: Configure NTP
-  lineinfile:
+  template:
-    path: /etc/systemd/timesyncd.conf
+    src: systemd/timesyncd.conf.j2
-    regexp: '^NTP='
+    dest: /etc/systemd/timesyncd.conf
-    line: "NTP={{ ntp_servers | join(' ') }}"
   notify: Restart systemd-timesyncd
-  when: inventory_hostname not in ntp_servers
+  when: "'ntp_server' not in group_names"

roles/ntp-client/templates/systemd/timesyncd.conf.j2

@@ -0,0 +1,2 @@
+[Time]
+NTP={{ ntp_client.servers | join(' ') }}