Browse Source

Use the networking-l2gw project new location

networking-l2gw and networking-l2gw-tempest-plugin are
imported to new location now and supposed to be retired from
openstack/namespace[1].

-https://review.opendev.org/#/c/744110/

Change-Id: I902ea79cdd3a8e56540ab44a7bd2f986f5d18bca
changes/31/753931/1
Ghanshyam Mann 12 months ago
committed by asarfaty
parent
commit
82d7e17c75
3 changed files with 29 additions and 12 deletions
  1. +10
    -10
      .zuul.yaml
  2. +18
    -1
      devstack/lib/nsx_common
  3. +1
    -1
      tox.ini

+ 10
- 10
.zuul.yaml View File

@ -11,7 +11,7 @@
- openstack-tox-pep8:
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
@ -23,7 +23,7 @@
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
@ -35,7 +35,7 @@
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
@ -47,7 +47,7 @@
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
@ -59,7 +59,7 @@
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
@ -75,7 +75,7 @@
- openstack-tox-pep8:
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
@ -87,7 +87,7 @@
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
@ -99,7 +99,7 @@
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
@ -111,7 +111,7 @@
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
@ -126,7 +126,7 @@
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- x/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas


+ 18
- 1
devstack/lib/nsx_common View File

@ -31,7 +31,7 @@ function _nsxv_ini_set {
function install_neutron_projects {
pkg_list="networking-l2gw networking-sfc neutron-fwaas neutron-dynamic-routing neutron-vpnaas vmware-nsxlib"
pkg_list="networking-sfc neutron-fwaas neutron-dynamic-routing neutron-vpnaas vmware-nsxlib"
for pkg in `echo $pkg_list`
do
pkg_renamed=`echo $pkg | sed 's/-/_/g'`
@ -47,6 +47,23 @@ function install_neutron_projects {
sudo chown -R ${USER}:${USER} src/${pkg}
fi
done
# same for packages out of stadium
pkg_list="networking-l2gw"
for pkg in `echo $pkg_list`
do
pkg_renamed=`echo $pkg | sed 's/-/_/g'`
sudo rm -rf /usr/local/lib/python2.7/dist-packages/${pkg_renamed}*
sudo rm -rf /usr/local/lib/python3.5/dist-packages/${pkg_renamed}*
sudo rm -rf ./src/${pkg_renamed}*
if is_plugin_enabled $pkg; then
echo "Plugin $pkg enabled explicitly with enable_plugin"
elif use_library_from_git $pkg; then
echo "Project $pkg enabled explicitly from LIBS_FROM_GIT"
else
sudo -H ${PIP} install -e "git+https://opendev.org/x/${pkg}@${NEUTRON_BRANCH}#egg=${pkg_renamed}"
sudo chown -R ${USER}:${USER} src/${pkg}
fi
done
# install neutron and octavia separately to not delete neutron-lib & octavia-lib
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron.egg*


+ 1
- 1
tox.ini View File

@ -29,7 +29,7 @@ commands = false
# https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs
# note that order is important to ensure dependencies don't override
commands =
pip install -q -e "git+https://opendev.org/openstack/networking-l2gw#egg=networking_l2gw"
pip install -q -e "git+https://opendev.org/x/networking-l2gw#egg=networking_l2gw"
pip install -q -e "git+https://opendev.org/openstack/networking-sfc@stable/ussuri#egg=networking_sfc"
pip install -q -e "git+https://opendev.org/openstack/neutron-fwaas@stable/ussuri#egg=neutron_fwaas"
pip install -q -e "git+https://opendev.org/openstack/neutron-dynamic-routing@stable/ussuri#egg=neutron_dynamic_routing"


Loading…
Cancel
Save