Update devstack to work with new split neutron services repos
This commit udpates devstack to work with the latest neutron services, which
are now in their own repositories. This will also unblock third party CI for
services testing. This also allows devstack users to run neutron with
services again.
Change-Id: I9cdd51f09edaccf218988240b48ce733d5771a65
diff --git a/lib/neutron b/lib/neutron
index 5a2bfea..0029158 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -99,6 +99,9 @@
NEUTRON_DIR=$DEST/neutron
+NEUTRON_FWAAS_DIR=$DEST/neutron-fwaas
+NEUTRON_LBAAS_DIR=$DEST/neutron-lbaas
+NEUTRON_VPNAAS_DIR=$DEST/neutron-vpnaas
NEUTRON_AUTH_CACHE_DIR=${NEUTRON_AUTH_CACHE_DIR:-/var/cache/neutron}
# Support entry points installation of console scripts
@@ -596,6 +599,18 @@
function install_neutron {
git_clone $NEUTRON_REPO $NEUTRON_DIR $NEUTRON_BRANCH
setup_develop $NEUTRON_DIR
+ if is_service_enabled q-fwaas; then
+ git_clone $NEUTRON_FWAAS_REPO $NEUTRON_FWAAS_DIR $NEUTRON_FWAAS_BRANCH
+ setup_develop $NEUTRON_FWAAS_DIR
+ fi
+ if is_service_enabled q-lbaas; then
+ git_clone $NEUTRON_LBAAS_REPO $NEUTRON_LBAAS_DIR $NEUTRON_LBAAS_BRANCH
+ setup_develop $NEUTRON_LBAAS_DIR
+ fi
+ if is_service_enabled q-vpn; then
+ git_clone $NEUTRON_VPNAAS_REPO $NEUTRON_VPNAAS_DIR $NEUTRON_VPNAAS_BRANCH
+ setup_develop $NEUTRON_VPNAAS_DIR
+ fi
if [ "$VIRT_DRIVER" == 'xenserver' ]; then
local dom0_ip