upstream.ipv6-tunnel: fix ipv6-tunnel-update.sh for upstream2

salt-pillar/upstream/upstream2.sls

@@ -1,3 +1,5 @@
+#!yaml|gpg
+
 upstream:
   interface: up2
   nat66-interface: up2

salt/upstream/ipv6-tunnel.sls

@@ -30,8 +30,8 @@ curl:
         [Network]
         Tunnel=ipv6
 
-{%- if pillar['ipv6-tunnel'].get('tunnelbroker') -%}
+{% if pillar['ipv6-tunnel'].get('tunnelbroker') %}
-/etc/cron.hourly/ipv6-tunnel-update.sh
+/etc/cron.hourly/ipv6-tunnel-update.sh:
   file.managed:
     - source: salt://upstream/ipv6-tunnel-update.sh
     - template: 'jinja'
@@ -41,18 +41,17 @@ curl:
         - pkg: curl
 
 cron:
-  service:
+  service.running:
-    - enabled
+    - enable: True
-    - running
+    - reload: True
     - watch:
         - file: /etc/cron.hourly/ipv6-tunnel-update.sh
-{%- endif -%}
+{% endif %}
 
-systemd-networkd:
+autostart-systemd-networkd:
-  service:
+  service.running:
-    - enabled
+    - name: systemd-networkd
-    - running
+      watch:
-    - watch:
         - file: /etc/systemd/network/ipv6.netdev
         - file: /etc/systemd/network/ipv6.network
         - file: /etc/systemd/network/ipv6-up.network