Browse code

Merge pull request #154 from cloudbuilders/openvswitch_fix

emergency fix to avoid installation of openvswitch if user is not using quantum

sleepsonthefloor authored on 2011/11/03 14:13:51
Showing 2 changed files
1 1
deleted file mode 100644
... ...
@@ -1,2 +0,0 @@
1
-openvswitch-switch
2
-openvswitch-datapath-dkms
... ...
@@ -787,6 +787,10 @@ fi
787 787
 
788 788
 # Quantum
789 789
 if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then
790
+    # Install deps
791
+    # FIXME add to files/apts/quantum, but don't install if not needed!
792
+    apt_get install openvswitch-switch openvswitch-datapath-dkms
793
+
790 794
     # Create database for the plugin/agent
791 795
     if [[ "$Q_PLUGIN" = "openvswitch" ]]; then
792 796
         if [[ "$ENABLED_SERVICES" =~ "mysql" ]]; then