fwdriver: fix systemd unit files and fw.py

fw.py

@@ -77,7 +77,7 @@ def reload_firewall_vlan(data, save_config=True):
 def reload_dhcp(data):
 def reload_dhcp(data):
     with open('/etc/dhcp/dhcpd.conf.generated', 'w') as f:
     with open('/etc/dhcp/dhcpd.conf.generated', 'w') as f:
         f.write("\n".join(data) + "\n")
         f.write("\n".join(data) + "\n")
-
+    import platform
     if platform.dist()[0]=="centos":
     if platform.dist()[0]=="centos":
         sudo(('/bin/systemctl', 'restart','dhcpd'))
         sudo(('/bin/systemctl', 'restart','dhcpd'))
     else:
     else:

miscellaneous/firewall-init.service

 [Unit]
 [Unit]
-Description=CIRCLE firewall
+Description=CIRCLE firewall init
 After=network.target
 After=network.target
+#Before=firewall.service
 
 
 [Service]
 [Service]
 User=root
 User=root
 Group=root
 Group=root
-WorkingDirectory=/home/fw/fwdriver
 
 
-ExecStart=/bin/bash -c "/etc/init.d/openvswitch restart ; /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;"
-
-Restart=always
+Type=oneshot
+ExecStart=/bin/bash -c "/bin/systemctl restart openvswitch ; /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]
 [Install]
 WantedBy=multi-user.target
 WantedBy=multi-user.target

miscellaneous/firewall.service

 [Unit]
 [Unit]
 Description=CIRCLE firewall
 Description=CIRCLE firewall
 After=network.target
 After=network.target
+Requires=firewall-init.service
 After=firewall-init.service
 After=firewall-init.service
 
 
 [Service]
 [Service]
@@ -8,8 +9,8 @@ User=fw
 Group=fw
 Group=fw
 WorkingDirectory=/home/fw/fwdriver
 WorkingDirectory=/home/fw/fwdriver
 
 
-ExecStart=/bin/bash -c "cd /home/fw/fwdriver ; . /home/fw/.virtualenvs/fw/bin/postactivate; . /home/fw/.virtualenvs/fw/bin/activate; HOSTNAME=$(hostname -s); exec celeryd -A fw -Q ${HOSTNAME}.firewall --loglevel=info -c 1"
-#ExecStartPost=/bin/systemclt restart dhcpd
+ExecStart=/bin/bash -c ". /home/fw/.virtualenvs/fw/bin/postactivate; . /home/fw/.virtualenvs/fw/bin/activate; exec celeryd -A fw -Q %H.firewall  --loglevel=info -c 1"
+#ExecStartPost=/bin/sudo /bin/systemctl restart dhcpd
 
 
 Restart=always
 Restart=always