josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #154 from cloudbuilders/openvswitch_fix

Browse source 
emergency fix to avoid installation of openvswitch if user is not using quantum
This commit is contained in:
sleepsonthefloor 2011-11-02 22:13:51 -07:00
commit 978207e642
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
files/apts/quantum
View file

@ -1,2 +0,0 @@
openvswitch-switch
openvswitch-datapath-dkms

4
stack.sh
View file

@ -787,6 +787,10 @@ fi
# Quantum # Quantum
if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then
# Install deps
# FIXME add to files/apts/quantum, but don't install if not needed!
apt_get install openvswitch-switch openvswitch-datapath-dkms
# Create database for the plugin/agent # Create database for the plugin/agent
if [[ "$Q_PLUGIN" = "openvswitch" ]]; then if [[ "$Q_PLUGIN" = "openvswitch" ]]; then
if [[ "$ENABLED_SERVICES" =~ "mysql" ]]; then if [[ "$ENABLED_SERVICES" =~ "mysql" ]]; then