prepare ipv6-tunnel with he.net for upstream2

salt-pillar/upstream/upstream2.sls

@@ -9,3 +9,8 @@ port-forwarding:
   - proto: udp
     port: 1194
     to: 172.20.75.9:1194
+
+ipv6-tunnel:
+  endpoint: 216.66.80.30
+  address: 2001:470:1f0a:12b2::2
+  gateway: 2001:470:1f0a:12b2::1

salt/top.sls

@@ -38,6 +38,7 @@ base:
     - collectd
   'upstream2':
     - upstream.port-forwarding
+    - upstream.ipv6-tunnel
   'anon*':
     - no-ssh
     - forwarding

salt/upstream/ipv6-tunnel.conf

@@ -0,0 +1,7 @@
+auto ipv6
+iface ipv6 inet6 v4tunnel
+        address {{ address }}
+        netmask 64
+        endpoint {{ endpoint }}
+        ttl 255
+        gateway {{ gateway }}

salt/upstream/ipv6-tunnel.sls

@@ -0,0 +1,15 @@
+/etc/network/interfaces.d/ipv6-tunnel.conf:
+  file.managed:
+    - source: salt://upstream/ipv6-tunnel.conf
+    - template: 'jinja'
+    - context:
+        endpoint: {{ pillar['ipv6-tunnel'].get('endpoint') }}
+        address: {{ pillar['ipv6-tunnel'].get('address') }}
+        gateway: {{ pillar['ipv6-tunnel'].get('gateway') }}
+    - require:
+        - pkg: ifupdown
+
+'ifdown ipv6; ifup ipv6':
+  cmd.run:
+    - onchanges:
+        - file: /etc/network/interfaces.d/ipv6-tunnel.conf

subnets.md

@@ -57,3 +57,13 @@ Machine-readable here: [salt-pillar/subnets](./salt-pillar/subnets/init.sls)
 * fd23:42:c3d2:5cd::/64 PRIV14
 * fd23:42:c3d2:5ce::/64 PRIV15
 * fd23:42:c3d2:5cf::/64 PRIV16
+
+## Tunnelbroker.net
+
+* 2001:470:1f0b:12b1::/64
+* 2001:470:77fb::/48
+
+# Peer C3D2:
+
+* 172.22.99.0/24
+* 2001:470:6d:670::/64