Merge pull request #37 from apatard/master

feat(config): Allow differents options for server and pool

chrony/files/default/chrony.conf.jinja

@@ -5,13 +5,21 @@
 
 {%- if chrony.ntpservers is defined %}
 {% for server in chrony.ntpservers -%}
+{% if server is mapping %}
+server {{ server.name }} {{ server.options | default(chrony.options) }}
+{% else %}
 server {{ server }} {{ chrony.options }}
+{% endif %}
 {% endfor %}
 {%- endif %}
 
 {%- if chrony.pool is defined %}
 {% for pool in chrony.pool -%}
+{% if pool is mapping %}
+pool {{ pool.name }} {{ pool.options | default(chrony.options) }}
+{% else %}
 pool {{ pool }} {{ chrony.options }}
+{% endif %}
 {% endfor %}
 {% endif %}
 

pillar.example

@@ -3,13 +3,15 @@
 ---
 chrony:
   ntpservers:
-    - '0.debian.pool.ntp.org'
-    - '1.centos.pool.ntp.org'
+    - name: '0.debian.pool.ntp.org'
+      options: iburst
+    - name: '1.centos.pool.ntp.org'
     - '2.arch.pool.ntp.org'
     - '3.gentoo.pool.ntp.org'
   pool:
-    - '0.debian.pool.ntp.org'
-    - '1.centos.pool.ntp.org'
+    - name: '0.debian.pool.ntp.org'
+      options: iburst
+    - name: '1.centos.pool.ntp.org'
     - '2.arch.pool.ntp.org'
     - '3.gentoo.pool.ntp.org'
   allow:

test/integration/default/controls/config_spec.rb

@@ -30,5 +30,9 @@ control 'Chrony configuration' do
     its('content') { should include keyfile }
     its('content') { should include driftfile }
     its('content') { should include logdir }
+    its('content') { should include 'server 0.debian.pool.ntp.org iburst' }
+    its('content') { should include 'server 1.centos.pool.ntp.org' }
+    its('content') { should include 'pool 0.debian.pool.ntp.org iburst' }
+    its('content') { should include 'pool 1.centos.pool.ntp.org' }
   end
 end