cleanup openstack git refs and lower constraints

This patch: - Updates git.openstack based URLs to use opendev. - Cleans up the lower-constraints.txt file to only include what we really need. Change-Id: I3eecd97c313c33c820ca2be8f01f6848244cd52a
2019-04-29 15:48:09 -06:00 · 2019-04-29 15:48:09 -06:00 · 4dfb2ecd50
parent bf9404ff1b
commit 4dfb2ecd50
4 changed files with 34 additions and 124 deletions
--- a/doc/source/devstack.rst
+++ b/doc/source/devstack.rst
@ -83,7 +83,7 @@ Flow Classifier
 Update the ``local.conf`` file::

    [[local|localrc]]
-    enable_plugin networking-sfc https://git.openstack.org/openstack/networking-sfc master
+    enable_plugin networking-sfc https://opendev.org/openstack/networking-sfc master
    Q_SERVICE_PLUGIN_CLASSES+=,networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin

    [[post-config|$NEUTRON_CONF]]
@ -107,7 +107,7 @@ Neutron dynamic routing plugin (bgp)
 Add neutron-dynamic-routing repo as an external repository and configure following flags in ``local.conf``::

    [[local|localrc]]
-    enable_plugin neutron-dynamic-routing https://git.openstack.org/openstack/neutron-dynamic-routing
+    enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing
    DR_MODE=dr_plugin
    BGP_PLUGIN=vmware_nsx.services.dynamic_routing.bgp_plugin.NSXvBgpPlugin

@ -121,7 +121,7 @@ Neutron VPNaaS
 Add neutron-vpnaas repo as an external repository and configure following flags in ``local.conf``::

    [[local|localrc]]
-    enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas
+    enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas
    NEUTRON_VPNAAS_SERVICE_PROVIDER=VPN:vmware:vmware_nsx.services.vpnaas.nsxv.ipsec_driver.NSXvIPsecVpnDriver:default

 Octavia
@ -133,8 +133,8 @@ Add octavia and python-octaviaclient repos as external repositories and configur
    OCTAVIA_NODE=api
    DISABLE_AMP_IMAGE_BUILD=True
    LIBS_FROM_GIT=python-openstackclient,python-octaviaclient
-    enable_plugin octavia https://git.openstack.org/openstack/octavia.git
-    enable_plugin octavia-dashboard https://git.openstack.org/openstack/octavia-dashboard
+    enable_plugin octavia https://opendev.org/openstack/octavia.git
+    enable_plugin octavia-dashboard https://opendev.org/openstack/octavia-dashboard
    enable_service octavia
    enable_service o-api,o-da

@ -256,8 +256,8 @@ Add octavia and python-octaviaclient repos as external repositories and configur
    OCTAVIA_NODE=api
    DISABLE_AMP_IMAGE_BUILD=True
    LIBS_FROM_GIT=python-openstackclient,python-octaviaclient
-    enable_plugin octavia https://git.openstack.org/openstack/octavia.git
-    enable_plugin octavia-dashboard https://git.openstack.org/openstack/octavia-dashboard
+    enable_plugin octavia https://opendev.org/openstack/octavia.git
+    enable_plugin octavia-dashboard https://opendev.org/openstack/octavia-dashboard
    enable_service octavia
    enable_service o-api,o-da

@ -337,8 +337,8 @@ Add octavia and python-octaviaclient repos as external repositories and configur
    OCTAVIA_NODE=api
    DISABLE_AMP_IMAGE_BUILD=True
    LIBS_FROM_GIT=python-openstackclient,python-octaviaclient
-    enable_plugin octavia https://git.openstack.org/openstack/octavia.git
-    enable_plugin octavia-dashboard https://git.openstack.org/openstack/octavia-dashboard
+    enable_plugin octavia https://opendev.org/openstack/octavia.git
+    enable_plugin octavia-dashboard https://opendev.org/openstack/octavia-dashboard
    enable_service octavia
    enable_service o-api,o-da

@ -431,7 +431,7 @@ Neutron dynamic routing plugin (bgp)
 Add neutron-dynamic-routing repo as an external repository and configure following flags in ``local.conf``::

    [[local|localrc]]
-    enable_plugin neutron-dynamic-routing https://git.openstack.org/openstack/neutron-dynamic-routing
+    enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing
    DR_MODE=dr_plugin
    BGP_PLUGIN=vmware_nsx.services.dynamic_routing.bgp_plugin.NSXBgpPlugin

@ -445,7 +445,7 @@ Neutron VPNaaS
 Add neutron-vpnaas repo as an external repository and configure following flags in ``local.conf``::

    [[local|localrc]]
-    enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas
+    enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas
    NEUTRON_VPNAAS_SERVICE_PROVIDER=VPN:vmware:vmware_nsx.services.vpnaas.nsx_tvd.ipsec_driver.NSXIPsecVpnDriver:default
    Q_SERVICE_PLUGIN_CLASSES+=,vmware_nsxtvd_vpnaas

--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@ -1,143 +1,51 @@
-alabaster==0.7.10
-alembic==0.8.10
-amqp==2.1.1
-appdirs==1.4.3
-asn1crypto==0.23.0
-Babel==2.3.4
-beautifulsoup4==4.6.0
-cachetools==2.0.0
-cffi==1.8.2
-cliff==2.8.0
-cmd2==0.8.0
-contextlib2==0.4.0
+bandit==1.1.0
 coverage==4.0
 decorator==4.3.0
-deprecation==1.0
-docutils==0.11
-dogpile.cache==0.6.2
-dulwich==0.15.0
 eventlet==0.24.1
-extras==1.0.0
-fasteners==0.7.0
 fixtures==3.0.0
 flake8==2.5.5
 flake8-import-order==0.12
-future==0.16.0
-futurist==1.2.0
-greenlet==0.4.10
 hacking==0.12.0
 httplib2==0.9.1
-idna==2.6
-imagesize==0.7.1
-iso8601==0.1.11
-Jinja2==2.10
-jmespath==0.9.0
-jsonpatch==1.16
-jsonpointer==1.13
-jsonschema==2.6.0
-keystonemiddleware==4.17.0
-kombu==4.0.0
-linecache2==1.0.0
-logilab-common==1.4.1
-logutils==0.3.5
-Mako==0.4.0
-MarkupSafe==1.0
-mccabe==0.2.1
 mock==2.0.0
-mox3==0.20.0
-msgpack-python==0.4.0
-munch==2.1.0
 netaddr==0.7.18
-netifaces==0.10.4
 neutron-lib==1.26.0
-octavia-lib==1.1.1 # Apache-2.0
+octavia-lib==1.1.1
 openstackdocstheme==1.18.1
-os-client-config==1.28.0
-os-service-types==1.2.0
-os-testr==1.0.0
-osc-lib==1.10.0
-oslo.cache==1.26.0
 oslo.concurrency==3.26.0
-oslo.config==6.4.0
+oslo.config==5.2.0
 oslo.context==2.19.2
 oslo.db==4.37.0
 oslo.i18n==3.15.3
 oslo.log==3.36.0
-oslo.messaging==5.29.0
-oslo.middleware==3.31.0
 oslo.policy==1.30.0
 oslo.privsep==1.32.0
-oslo.reports==1.18.0
-oslo.rootwrap==5.8.0
 oslo.serialization==2.28.1
 oslo.service==1.31.0
 oslo.utils==3.33.0
 oslo.vmware==2.17.0
 oslotest==3.2.0
-osprofiler==1.4.0
-ovs==2.8.0
-ovsdbapp==0.10.0
-paramiko==2.0.0
-Paste==2.0.2
-PasteDeploy==1.5.0
+osc-lib==1.10.0
 pbr==4.0.0
-pep8==1.5.7
-pika==0.10.0
-pika-pool==0.1.3
-positional==1.2.1
 prettytable==0.7.2
 psycopg2==2.7
-psutil==3.2.2
-pycadf==1.1.0
-pycodestyle==2.3.1
-pycparser==2.18
-pyflakes==0.8.1
-Pygments==2.2.0
-pyinotify==0.9.6
-pylint==1.7.1
-pyperclip==1.5.27
-python-dateutil==2.5.3
-python-designateclient==2.7.0
-python-editor==1.0.3
-python-mimeparse==1.6.0
-python-neutronclient==6.7.0
-python-novaclient==9.1.0
-python-openstackclient==3.16.0
-python-subunit==1.0.0
-pytz==2013.6
 PyMySQL==0.7.6
-PyYAML==3.12
+pylint==1.7.1
+python-openstackclient==3.16.0
 reno==2.5.0
-repoze.lru==0.7
+requests==2.14.2
 requests-mock==1.2.0
-requestsexceptions==1.2.0
-rfc3986==0.3.1
-Routes==2.3.1
-simplejson==3.5.1
 six==1.10.0
-snowballstemmer==1.2.1
-Sphinx==1.6.5
-sphinxcontrib-websupport==1.0.1
 SQLAlchemy==1.2.0
-sqlalchemy-migrate==0.11.0
-sqlparse==0.2.2
-statsd==3.2.1
+Sphinx==1.6.5
 stestr==1.0.0
 stevedore==1.20.0
 tempest==17.1.0
-Tempita==0.5.2
 tenacity==4.9.0
 testrepository==0.0.18
 testresources==2.0.0
 testscenarios==0.4
 testtools==2.2.0
-tinyrpc==0.6
-traceback2==1.4.0
 tooz==1.58.0
-unittest2==1.1.0
-urllib3==1.21.1
-vine==1.1.4
 vmware-nsxlib==13.1.0
-waitress==1.1.0
 WebTest==2.0.27
-wrapt==1.7.0
--- a/requirements.txt
+++ b/requirements.txt
@ -5,6 +5,7 @@ pbr>=4.0.0 # Apache-2.0

 eventlet>=0.24.1 # MIT
 httplib2>=0.9.1 # MIT
+requests>=2.14.2 # Apache-2.0
 netaddr>=0.7.18 # BSD
 tenacity>=4.9.0 # Apache-2.0
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.2.0 # MIT
@ -16,10 +17,11 @@ octavia-lib>=1.1.1 # Apache-2.0
 python-openstackclient>=3.16.0 # Apache-2.0
 oslo.concurrency>=3.26.0 # Apache-2.0
 oslo.context>=2.19.2 # Apache-2.0
-oslo.config>=6.4.0 # Apache-2.0
+oslo.config>=5.2.0 # Apache-2.0
 oslo.db>=4.37.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
+oslo.policy>=1.30.0 # Apache-2.0
 oslo.serialization>=2.28.1 # Apache-2.0
 oslo.service>=1.31.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
--- a/tox.ini
+++ b/tox.ini
@ -8,7 +8,7 @@ setenv = VIRTUAL_ENV={envdir}
         PYTHONWARNINGS=default::DeprecationWarning
 passenv = TRACE_FAILONLY GENERATE_HASHES http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
 usedevelop = True
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
       -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
 whitelist_externals =
@ -28,15 +28,15 @@ 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://git.openstack.org/openstack/networking-l2gw#egg=networking_l2gw"
-    pip install -q -e "git+https://git.openstack.org/openstack/networking-sfc#egg=networking_sfc"
-    pip install -q -e "git+https://git.openstack.org/openstack/neutron-lbaas#egg=neutron_lbaas"
-    pip install -q -e "git+https://git.openstack.org/openstack/neutron-fwaas#egg=neutron_fwaas"
-    pip install -q -e "git+https://git.openstack.org/openstack/neutron-dynamic-routing#egg=neutron_dynamic_routing"
-    pip install -q -e "git+https://git.openstack.org/openstack/neutron-vpnaas#egg=neutron_vpnaas"
-    pip install -q -e "git+https://git.openstack.org/openstack/octavia#egg=octavia"
-    pip install -q -e "git+https://git.openstack.org/openstack/vmware-nsxlib#egg=vmware_nsxlib"
-    pip install -q -e "git+https://git.openstack.org/openstack/neutron#egg=neutron"
+    pip install -q -e "git+https://opendev.org/openstack/networking-l2gw#egg=networking_l2gw"
+    pip install -q -e "git+https://opendev.org/openstack/networking-sfc#egg=networking_sfc"
+    pip install -q -e "git+https://opendev.org/openstack/neutron-lbaas#egg=neutron_lbaas"
+    pip install -q -e "git+https://opendev.org/openstack/neutron-fwaas#egg=neutron_fwaas"
+    pip install -q -e "git+https://opendev.org/openstack/neutron-dynamic-routing#egg=neutron_dynamic_routing"
+    pip install -q -e "git+https://opendev.org/openstack/neutron-vpnaas#egg=neutron_vpnaas"
+    pip install -q -e "git+https://opendev.org/openstack/octavia#egg=octavia"
+    pip install -q -e "git+https://opendev.org/openstack/vmware-nsxlib#egg=vmware_nsxlib"
+    pip install -q -e "git+https://opendev.org/openstack/neutron#egg=neutron"


 [testenv:functional]
@ -66,7 +66,7 @@ sitepackages = True

 [testenv:releasenotes]
 basepython = python3
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
       -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html

@ -146,7 +146,7 @@ commands =

 [testenv:docs]
 basepython = python3
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
       -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -b html doc/source doc/build/html