Add support for HWCLOCK sync when configuring ntp.ng

ntp/ng/init.sls

@@ -40,3 +40,22 @@ ntpd:
     - watch:
       - file: ntpd_conf
 {% endif %}
+
+{#% if 'defaults' in ntp.lookup %#}
+ntpd_defaults:
+  file.managed:
+    - name: {{ ntp.lookup.defaults }}
+    - user: root
+    - group: root
+    - mode: 0664
+    - contents: |
+        # Options for ntpdate
+        OPTIONS="{{ ntp.service.options }}"
+
+        # Number of retries before giving up
+        RETRIES={{ ntp.service.retries }}
+
+        # Set to 'yes' to sync hw clock after successful ntpdate
+        SYNC_HWCLOCK={{ ntp.service.sync_hwclock }}
+
+{#% endif %#}

ntp/ng/map.jinja

@@ -17,7 +17,8 @@
         'RedHat': {
             'package': 'ntp',
             'service': 'ntpd',
-            'ntp_conf': '/etc/ntp.conf'
+            'ntp_conf': '/etc/ntp.conf',
+						'defaults': '/etc/sysconfig/ntpdate'
         },
         'Suse': {
             'package': 'ntp',
@@ -40,6 +41,13 @@
             'restrict': ['default noquery nopeer', '127.0.0.1', '::1'],
             'driftfile': [ default_driftfile ]
         }
+		}),
+		'service': { 'options': '-p 2',
+				         'retries': '2',
+				         'sync_hwclock': 'no',
+		           }
+
+    }
+ %}
 
-    })
-} %}
+{% do ntp.service.update( salt['pillar.get']('ntp:ng:service', {})) %}

pillar.example

@@ -53,13 +53,20 @@ ntp:
   ng:
     # OS-specific data that should, in most cases, be handled by map.jinja.
     # It is an optional key and is only used to override defaults.
+    service:
+      # overrides daemon startup options
+      options: -p 2
+      retries: 2
+      sync_hwclock: False
     lookup:
       package: ntp
       service: ntpd
       provider: systemd
       ntp_conf: /etc/ntp.conf
     # State-specific options
     settings:
+		  # if `yes`, set flags to update the hardware after sync
+			sync_hwclock: no
       # If `True`, ntpd will be enabled. Otherwise ntp.conf will be configured
       # but ntpd will not be enabled or started.
       ntpd: True