Fix order, remove ntp for everyone if present

hshbase/time/init.sls

 {% from "hshbase/map.jinja" import hshbase with context %}
 
-{% if (grains['os'] == 'Debian' and grains['osmajorrelease'] >= 10) or grains['os'] == 'Ubuntu' and grains['osmajorrelease'] >= 18 %}
-
-ntp:
-  pkg.purged
+hsh_disable_legacy_ntp_service:
+  service.disabled:
+    - name: ntp
 
-/etc/ntp.conf:
+hsh_remove_legacy_ntp_conf:
   file.absent:
+    - name: /etc/ntp.conf
     - require:
-      - pkg: ntp
+      - service:hsh_disable_legacy_ntp_service
 
-hsh_ntp_service_not_running:
-  service.disabled:
+hsh_purge_legacy_ntp:
+  pkg.purged:
     - name: ntp
     - require:
-      - file: /etc/ntp.conf
-      - pkg: ntp
+      - file:hsh_remove_legacy_ntp_conf
 
-{% endif %}
 
 hsh_server_timezone:
   timezone.system: