random fixes

salt/manager/files/compile.sh

@@ -5,6 +5,9 @@ source /home/{{ pillar['user'] }}/.virtualenvs/circle/bin/postactivate
 MANAGE="python /home/{{ pillar['user'] }}/circle/circle/manage.py"
 MANAGE="python /home/{{ pillar['user'] }}/circle/circle/manage.py"
 bower install
 bower install
 
 
+$MANAGE compileless
+$MANAGE compilejsi18n -o dashboard/static/jsi18n
+
 COLLECTED=$($MANAGE collectstatic --noinput |
 COLLECTED=$($MANAGE collectstatic --noinput |
             awk '/static files copied to/ {print $1}')
             awk '/static files copied to/ {print $1}')
 
 

salt/network/init.sls

@@ -10,9 +10,11 @@ linka:
     - proto: manual
     - proto: manual
     - pre_up_cmds:
     - pre_up_cmds:
       - ip link add linka type veth peer name linkb
       - ip link add linka type veth peer name linkb
-      - ovs-vsctl --if-exists del-port cloud linka
-    - post_up_cmds:
-      - ovs-vsctl --may-exist add-port cloud linka
+      - /etc/init.d/openvswitch-switch restart
+      - /usr/bin/ovs-vsctl --if-exists del-port cloud linka
+      - /usr/bin/ovs-vsctl --may-exist add-port cloud linka
+      - ip link set linka up
+      - ip link set linkb up
     - post_down_cmds:
     - post_down_cmds:
       - ip link del linka
       - ip link del linka
 
 
@@ -26,13 +28,15 @@ man0:
   network.managed:
   network.managed:
     - enabled: True
     - enabled: True
     - type: eth
     - type: eth
-    - proto: none
+    - proto: static
     - ipaddr: {{ pillar['fwdriver']['portal_ip'] }}
     - ipaddr: {{ pillar['fwdriver']['portal_ip'] }}
     - netmask: {{ pillar['fwdriver']['portal_netmask'] }}
     - netmask: {{ pillar['fwdriver']['portal_netmask'] }}
     - gateway: {{ pillar['fwdriver']['management_net'].split('/')[0] }}
     - gateway: {{ pillar['fwdriver']['management_net'].split('/')[0] }}
     - dns:
     - dns:
       - 8.8.8.8
       - 8.8.8.8
       - 8.8.4.4
       - 8.8.4.4
+    - pre_up_cmds:
+      - /etc/init.d/openvswitch-switch restart
     - require:
     - require:
       - cmd: ovs-if
       - cmd: ovs-if