random fixes v2

fw.py

@@ -231,11 +231,11 @@ def start_networking():
             reload_firewall_vlan(data, True)
             reload_firewall_vlan(data, True)
     except:
     except:
         print 'nemsikerult:('
         print 'nemsikerult:('
-        raise
+#        raise
 
 
 
 
 def main():
 def main():
     start_networking()
     start_networking()
     start_firewall()
     start_firewall()
 
 
-main()
+main()
\ No newline at end of file

miscellaneous/firewall.conf

@@ -11,8 +11,10 @@ setuid fw
 
 
 script
 script
     cd /home/fw/fwdriver
     cd /home/fw/fwdriver
+    . /home/fw/.virtualenvs/fw/bin/postactivate
     . /home/fw/.virtualenvs/fw/bin/activate
     . /home/fw/.virtualenvs/fw/bin/activate
-    celeryd -A fw -Q firewall,dhcp --loglevel=info
+    HOSTNAME=$(hostname -s)
+    exec celeryd -A fw -Q ${HOSTNAME}.firewall --loglevel=info -c 1
 
 
 end script
 end script
 
 

ovs.py

@@ -96,7 +96,7 @@ class Switch:
                       name] + interfaces + ['tag=%d' % int(tag)]
                       name] + interfaces + ['tag=%d' % int(tag)]
         else:
         else:
             params = ['add-port', self.brname, name]
             params = ['add-port', self.brname, name]
-            if tag is not None:
+            if tag is not None and (trunks is None or len(trunks) == 0):
                 params = params + ['tag=%d' % int(tag)]
                 params = params + ['tag=%d' % int(tag)]
         if internal:
         if internal:
             params = params + ['--',  'set', 'Interface', interfaces[0],
             params = params + ['--',  'set', 'Interface', interfaces[0],