Browse code
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
Kyle Mestery authored on 2014/12/08 15:17:27Showing 5 changed files
- lib/neutron
- lib/neutron_plugins/services/firewall
- lib/neutron_plugins/services/loadbalancer
- lib/neutron_plugins/services/vpn
- stackrc
| ... | ... |
@@ -99,6 +99,9 @@ GITDIR["python-neutronclient"]=$DEST/python-neutronclient |
| 99 | 99 |
|
| 100 | 100 |
|
| 101 | 101 |
NEUTRON_DIR=$DEST/neutron |
| 102 |
+NEUTRON_FWAAS_DIR=$DEST/neutron-fwaas |
|
| 103 |
+NEUTRON_LBAAS_DIR=$DEST/neutron-lbaas |
|
| 104 |
+NEUTRON_VPNAAS_DIR=$DEST/neutron-vpnaas |
|
| 102 | 105 |
NEUTRON_AUTH_CACHE_DIR=${NEUTRON_AUTH_CACHE_DIR:-/var/cache/neutron}
|
| 103 | 106 |
|
| 104 | 107 |
# Support entry points installation of console scripts |
| ... | ... |
@@ -596,6 +599,18 @@ function init_neutron {
|
| 596 | 596 |
function install_neutron {
|
| 597 | 597 |
git_clone $NEUTRON_REPO $NEUTRON_DIR $NEUTRON_BRANCH |
| 598 | 598 |
setup_develop $NEUTRON_DIR |
| 599 |
+ if is_service_enabled q-fwaas; then |
|
| 600 |
+ git_clone $NEUTRON_FWAAS_REPO $NEUTRON_FWAAS_DIR $NEUTRON_FWAAS_BRANCH |
|
| 601 |
+ setup_develop $NEUTRON_FWAAS_DIR |
|
| 602 |
+ fi |
|
| 603 |
+ if is_service_enabled q-lbaas; then |
|
| 604 |
+ git_clone $NEUTRON_LBAAS_REPO $NEUTRON_LBAAS_DIR $NEUTRON_LBAAS_BRANCH |
|
| 605 |
+ setup_develop $NEUTRON_LBAAS_DIR |
|
| 606 |
+ fi |
|
| 607 |
+ if is_service_enabled q-vpn; then |
|
| 608 |
+ git_clone $NEUTRON_VPNAAS_REPO $NEUTRON_VPNAAS_DIR $NEUTRON_VPNAAS_BRANCH |
|
| 609 |
+ setup_develop $NEUTRON_VPNAAS_DIR |
|
| 610 |
+ fi |
|
| 599 | 611 |
|
| 600 | 612 |
if [ "$VIRT_DRIVER" == 'xenserver' ]; then |
| 601 | 613 |
local dom0_ip |
| ... | ... |
@@ -5,7 +5,7 @@ |
| 5 | 5 |
FW_XTRACE=$(set +o | grep xtrace) |
| 6 | 6 |
set +o xtrace |
| 7 | 7 |
|
| 8 |
-FWAAS_PLUGIN=neutron.services.firewall.fwaas_plugin.FirewallPlugin |
|
| 8 |
+FWAAS_PLUGIN=neutron_fwaas.services.firewall.fwaas_plugin.FirewallPlugin |
|
| 9 | 9 |
|
| 10 | 10 |
function neutron_fwaas_configure_common {
|
| 11 | 11 |
_neutron_service_plugin_class_add $FWAAS_PLUGIN |
| ... | ... |
@@ -7,7 +7,7 @@ set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
|
| 9 | 9 |
AGENT_LBAAS_BINARY="$NEUTRON_BIN_DIR/neutron-lbaas-agent" |
| 10 |
-LBAAS_PLUGIN=neutron.services.loadbalancer.plugin.LoadBalancerPlugin |
|
| 10 |
+LBAAS_PLUGIN=neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPlugin |
|
| 11 | 11 |
|
| 12 | 12 |
function neutron_agent_lbaas_install_agent_packages {
|
| 13 | 13 |
if is_ubuntu || is_fedora || is_suse; then |
| ... | ... |
@@ -7,7 +7,7 @@ set +o xtrace |
| 7 | 7 |
|
| 8 | 8 |
|
| 9 | 9 |
AGENT_VPN_BINARY="$NEUTRON_BIN_DIR/neutron-vpn-agent" |
| 10 |
-VPN_PLUGIN=${VPN_PLUGIN:-"neutron.services.vpn.plugin.VPNDriverPlugin"}
|
|
| 10 |
+VPN_PLUGIN=${VPN_PLUGIN:-"neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin"}
|
|
| 11 | 11 |
IPSEC_PACKAGE=${IPSEC_PACKAGE:-"openswan"}
|
| 12 | 12 |
|
| 13 | 13 |
function neutron_vpn_install_agent_packages {
|
| ... | ... |
@@ -185,6 +185,18 @@ KEYSTONE_BRANCH=${KEYSTONE_BRANCH:-master}
|
| 185 | 185 |
NEUTRON_REPO=${NEUTRON_REPO:-${GIT_BASE}/openstack/neutron.git}
|
| 186 | 186 |
NEUTRON_BRANCH=${NEUTRON_BRANCH:-master}
|
| 187 | 187 |
|
| 188 |
+# neutron fwaas service |
|
| 189 |
+NEUTRON_FWAAS_REPO=${NEUTRON_FWAAS_REPO:-${GIT_BASE}/openstack/neutron-fwaas.git}
|
|
| 190 |
+NEUTRON_FWAAS_BRANCH=${NEUTRON_FWAAS_BRANCH:-master}
|
|
| 191 |
+ |
|
| 192 |
+# neutron lbaas service |
|
| 193 |
+NEUTRON_LBAAS_REPO=${NEUTRON_LBAAS_REPO:-${GIT_BASE}/openstack/neutron-lbaas.git}
|
|
| 194 |
+NEUTRON_LBAAS_BRANCH=${NEUTRON_LBAAS_BRANCH:-master}
|
|
| 195 |
+ |
|
| 196 |
+# neutron vpnaas service |
|
| 197 |
+NEUTRON_VPNAAS_REPO=${NEUTRON_VPNAAS_REPO:-${GIT_BASE}/openstack/neutron-vpnaas.git}
|
|
| 198 |
+NEUTRON_VPNAAS_BRANCH=${NEUTRON_VPNAAS_BRANCH:-master}
|
|
| 199 |
+ |
|
| 188 | 200 |
# compute service |
| 189 | 201 |
NOVA_REPO=${NOVA_REPO:-${GIT_BASE}/openstack/nova.git}
|
| 190 | 202 |
NOVA_BRANCH=${NOVA_BRANCH:-master}
|