@@ -101,6 +101,9 @@ GITDIR["python-neutronclient"]=$DEST/python-neutronclient

 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

@@ -598,6 +601,18 @@ function init_neutron {

 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

@@ -5,7 +5,7 @@

 FW_XTRACE=$(set +o | grep xtrace)

 set +o xtrace

-FWAAS_PLUGIN=neutron.services.firewall.fwaas_plugin.FirewallPlugin

+FWAAS_PLUGIN=neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin

 function neutron_fwaas_configure_common {

     _neutron_service_plugin_class_add $FWAAS_PLUGIN

@@ -7,7 +7,7 @@ set +o xtrace

 AGENT_LBAAS_BINARY="$NEUTRON_BIN_DIR/neutron-lbaas-agent"

-LBAAS_PLUGIN=neutron.services.loadbalancer.plugin.LoadBalancerPlugin

+LBAAS_PLUGIN=neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin

 function neutron_agent_lbaas_install_agent_packages {

     if is_ubuntu || is_fedora || is_suse; then

@@ -7,7 +7,7 @@ set +o xtrace

 AGENT_VPN_BINARY="$NEUTRON_BIN_DIR/neutron-vpn-agent"

-VPN_PLUGIN=${VPN_PLUGIN:-"neutron.services.vpn.plugin.VPNDriverPlugin"}

+VPN_PLUGIN=${VPN_PLUGIN:-"neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin"}

 IPSEC_PACKAGE=${IPSEC_PACKAGE:-"openswan"}

 function neutron_vpn_install_agent_packages {

@@ -187,6 +187,18 @@ KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master}

 NEUTRON_REPO=${NEUTRON_REPO:-${GIT_BASE}/openstack/neutron.git}

 NEUTRON_BRANCH=${NEUTRON_BRANCH:-master}

+# neutron fwaas service

+NEUTRON_FWAAS_REPO=${NEUTRON_FWAAS_REPO:-${GIT_BASE}/openstack/neutron-fwaas.git}

+NEUTRON_FWAAS_BRANCH=${NEUTRON_FWAAS_BRANCH:-master}

+

+# neutron lbaas service

+NEUTRON_LBAAS_REPO=${NEUTRON_LBAAS_REPO:-${GIT_BASE}/openstack/neutron-lbaas.git}

+NEUTRON_LBAAS_BRANCH=${NEUTRON_LBAAS_BRANCH:-master}

+

+# neutron vpnaas service

+NEUTRON_VPNAAS_REPO=${NEUTRON_VPNAAS_REPO:-${GIT_BASE}/openstack/neutron-vpnaas.git}

+NEUTRON_VPNAAS_BRANCH=${NEUTRON_VPNAAS_BRANCH:-master}

+

 # compute service

 NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git}

 NOVA_BRANCH=${NOVA_BRANCH:-master}