From bdc254eb38037be51f125f3b84f5d4c698e7c2ab Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Wed, 2 Nov 2011 23:57:12 -0500 Subject: [PATCH 1/3] emergency fix to not install openvswitch if user is not using quantum --- files/apts/quantum | 2 -- stack.sh | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 files/apts/quantum diff --git a/files/apts/quantum b/files/apts/quantum deleted file mode 100644 index f5008adfed..0000000000 --- a/files/apts/quantum +++ /dev/null @@ -1,2 +0,0 @@ -openvswitch-switch -openvswitch-datapath-dkms diff --git a/stack.sh b/stack.sh index 31194bc48a..19d7e84489 100755 --- a/stack.sh +++ b/stack.sh @@ -787,6 +787,10 @@ fi # Quantum if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then + # Install deps + # FIXME add to file/apts/quantum, but don't install if not needed! + apt_get install -y openvswitch-switch openvswitch-datapath-dkms + # Create database for the plugin/agent if [[ "$Q_PLUGIN" = "openvswitch" ]]; then if [[ "$ENABLED_SERVICES" =~ "mysql" ]]; then From ae7f264970d0139831e899810995523e72a89dda Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Thu, 3 Nov 2011 00:03:53 -0500 Subject: [PATCH 2/3] remove -y since this is using apt_get --- stack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.sh b/stack.sh index 19d7e84489..446661a6ca 100755 --- a/stack.sh +++ b/stack.sh @@ -789,7 +789,7 @@ fi if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then # Install deps # FIXME add to file/apts/quantum, but don't install if not needed! - apt_get install -y openvswitch-switch openvswitch-datapath-dkms + apt_get install openvswitch-switch openvswitch-datapath-dkms # Create database for the plugin/agent if [[ "$Q_PLUGIN" = "openvswitch" ]]; then From 0c3b60ce00bb23926668289110917cebcf47e0e4 Mon Sep 17 00:00:00 2001 From: Anthony Young Date: Thu, 3 Nov 2011 00:07:55 -0500 Subject: [PATCH 3/3] typo --- stack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.sh b/stack.sh index 446661a6ca..6a001c6f12 100755 --- a/stack.sh +++ b/stack.sh @@ -788,7 +788,7 @@ fi # Quantum if [[ "$ENABLED_SERVICES" =~ "q-svc" ]]; then # Install deps - # FIXME add to file/apts/quantum, but don't install if not needed! + # 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