Moved firewall-init.service template from fwdriver to salt;

this makes debian branch in fwdriver.git unneeded

salt/fwdriver/configuration.sls

@@ -22,7 +22,7 @@ include:
     - user: root
     - user: root
     - group: root
     - group: root
     - template: jinja
     - template: jinja
-    - source: file:///home/{{ pillar['fwdriver']['user'] }}/fwdriver/miscellaneous/firewall-init.service
+    - source: salt://fwdriver/files/firewall-init.service
 {% else %}
 {% else %}
 /etc/init/firewall.conf:
 /etc/init/firewall.conf:
   file.managed:
   file.managed:

salt/fwdriver/files/firewall-init.service

+[Unit]
+Description=CIRCLE firewall init
+After=network.target
+#Before=firewall.service
+
+[Service]
+User=root
+Group=root
+
+Type=oneshot
+ExecStart=/bin/bash -c "/bin/systemctl restart openvswitch{%if grains['os']=='Debian'%}-switch{%endif%} ; /sbin/ip netns add fw || true; ovs-vsctl del-br firewall || true; /sbin/ip netns exec fw sysctl -f /etc/sysctl.d/60-circle-firewall.conf ; /sbin/ip netns exec fw ip link set lo up"
+
+[Install]
+WantedBy=multi-user.target
+