From e69c508770a580fca397ac00058e3d330793326e Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 23 Apr 2019 19:38:39 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Change-Id: Idf2aeff4939079743dfae567ea15193b971af464 --- CONTRIBUTING.rst | 2 +- HACKING.rst | 2 +- README.rst | 6 +++--- TESTING.rst | 2 +- devstack/lib/l3_agent | 2 +- devstack/local.conf.sample | 2 +- devstack/local_AIO.conf.sample | 2 +- doc/source/contributor/devstack.rst | 2 +- doc/source/contributor/index.rst | 2 +- doc/source/contributor/team.rst | 2 +- doc/source/contributor/testing-with-devstack.rst | 6 +++--- neutron_vpnaas/tests/contrib/gate_hook.sh | 2 +- tox.ini | 4 ++-- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index c299c701f..f5e85f856 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,4 +1,4 @@ Please see the Neutron CONTRIBUTING.rst file for how to contribute to neutron-vpnaas: -`Neutron CONTRIBUTING.rst `_ +`Neutron CONTRIBUTING.rst `_ diff --git a/HACKING.rst b/HACKING.rst index e75f9be3d..c14e4bebe 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -4,4 +4,4 @@ Neutron VPNaaS Style Commandments Please see the Neutron HACKING.rst file for style commandments for neutron-vpnaas: -`Neutron HACKING.rst `_ +`Neutron HACKING.rst `_ diff --git a/README.rst b/README.rst index 1bc049acc..f32a9344b 100644 --- a/README.rst +++ b/README.rst @@ -12,11 +12,11 @@ The homepage for Neutron is: https://launchpad.net/neutron. Use this site for asking for help, and filing bugs. We use a single Launchpad page for all Neutron projects. -Code is available on git.openstack.org at: -https://git.openstack.org/cgit/openstack/neutron-vpnaas. +Code is available on opendev.org at: +https://opendev.org/openstack/neutron-vpnaas. Please refer to Neutron documentation for more information: -`Neutron README.rst `_ +`Neutron README.rst `_ Team and repository tags ======================== diff --git a/TESTING.rst b/TESTING.rst index c6f46478a..e0e4173a3 100644 --- a/TESTING.rst +++ b/TESTING.rst @@ -5,4 +5,4 @@ Please see the TESTING.rst file for the Neutron project itself. This will have the latest up to date instructions for how to test Neutron, and will be applicable to neutron-vpnaas as well: -`Neutron TESTING.rst `_ +`Neutron TESTING.rst `_ diff --git a/devstack/lib/l3_agent b/devstack/lib/l3_agent index 0c5b74f49..6564e6918 100644 --- a/devstack/lib/l3_agent +++ b/devstack/lib/l3_agent @@ -1,5 +1,5 @@ # This file is completely based on one in the neutron repository here: -# http://git.openstack.org/cgit/openstack/neutron/tree/devstack/lib/l2_agent +# https://opendev.org/openstack/neutron/src/branch/master/devstack/lib/l2_agent NEUTRON_L3_CONF=${NEUTRON_L3_CONF:-$Q_L3_CONF_FILE} diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample index e136b7dfa..1daa0457c 100644 --- a/devstack/local.conf.sample +++ b/devstack/local.conf.sample @@ -1,6 +1,6 @@ [[local|localrc]] -enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas +enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas disable_service n-net enable_service q-svc diff --git a/devstack/local_AIO.conf.sample b/devstack/local_AIO.conf.sample index ac2132e23..ba532240c 100644 --- a/devstack/local_AIO.conf.sample +++ b/devstack/local_AIO.conf.sample @@ -5,7 +5,7 @@ enable_service q-agent enable_service q-dhcp enable_service q-l3 enable_service q-meta -enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas +enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas FIXED_RANGE=10.1.0.0/24 FIXED_NETWORK_SIZE=256 diff --git a/doc/source/contributor/devstack.rst b/doc/source/contributor/devstack.rst index 38b610794..ce4cc8220 100644 --- a/doc/source/contributor/devstack.rst +++ b/doc/source/contributor/devstack.rst @@ -33,7 +33,7 @@ section of devstack's local.conf file:: For example:: - enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas stable/kilo + enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas stable/kilo The default implementation for IPSEC package under DevStack is 'strongswan'. However, depending upon the Linux distribution, you may need to override diff --git a/doc/source/contributor/index.rst b/doc/source/contributor/index.rst index 5d5a8fc8f..3108fe4f5 100644 --- a/doc/source/contributor/index.rst +++ b/doc/source/contributor/index.rst @@ -41,7 +41,7 @@ recommended to check `Request for Feature Enhancements`_ (RFE) process. .. __: https://bugs.launchpad.net/neutron/+bugs?field.tag=vpnaas .. __: https://bugs.launchpad.net/neutron/+bugs?field.tag=rfe -.. _`neutron drivers`: https://review.openstack.org/#/admin/groups/464,members +.. _`neutron drivers`: https://review.opendev.org/#/admin/groups/464,members .. _`Request for Feature Enhancements`: https://docs.openstack.org/neutron/latest/contributor/policies/blueprints.html#neutron-request-for-feature-enhancements To get in touch with the neutron-vpnaas community, diff --git a/doc/source/contributor/team.rst b/doc/source/contributor/team.rst index b23a211dc..d467404db 100644 --- a/doc/source/contributor/team.rst +++ b/doc/source/contributor/team.rst @@ -5,7 +5,7 @@ Core reviewers and Driver maintainers Core reviewers -------------- -The `Neutron VPNaaS Core Reviewer Team `_ +The `Neutron VPNaaS Core Reviewer Team `_ is responsible for many things that same as `Neutron team `_. Driver maintainers diff --git a/doc/source/contributor/testing-with-devstack.rst b/doc/source/contributor/testing-with-devstack.rst index 6abcd0ff4..8cb1eb2a1 100644 --- a/doc/source/contributor/testing-with-devstack.rst +++ b/doc/source/contributor/testing-with-devstack.rst @@ -12,7 +12,7 @@ you'll need the following settings in your local.conf. You can find an example at `devstack/local.conf.sample -`_ +`_ in the source tree. Quick Test Script @@ -22,7 +22,7 @@ This quick test script creates two sites with a router, a network and a subnet c with public network. Then, connect both sites via VPN. You can find an example at `tools/test_script.sh -`_ +`_ in the source tree. Using Two DevStack Nodes for Testing @@ -159,7 +159,7 @@ DevStack Configuration ^^^^^^^^^^^^^^^^^^^^^^ For single DevStack and two routers case, You can find an example at `devstack/local_AIO.conf.sample -`_ +`_ in the source tree. Start up the cloud using ``./stack.sh`` and ensure it completes successfully. diff --git a/neutron_vpnaas/tests/contrib/gate_hook.sh b/neutron_vpnaas/tests/contrib/gate_hook.sh index 2e0b7d408..2a9137bef 100755 --- a/neutron_vpnaas/tests/contrib/gate_hook.sh +++ b/neutron_vpnaas/tests/contrib/gate_hook.sh @@ -4,7 +4,7 @@ set -ex VENV=${1:-"dsvm-functional"} DEVSTACK_LOCAL_CONFIG="NETWORK_API_EXTENSIONS=all" -DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas" +DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas" export DEVSTACK_LOCAL_CONFIG case $VENV in diff --git a/tox.ini b/tox.ini index 53acb0df3..1e7d27864 100644 --- a/tox.ini +++ b/tox.ini @@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir} OS_STDERR_CAPTURE={env:OS_STDERR_CAPTURE:true} PYTHONWARNINGS=default::DeprecationWarning 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 = sh @@ -38,7 +38,7 @@ whitelist_externals = # 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/neutron#egg=neutron" + pip install -q -e "git+https://opendev.org/openstack/neutron#egg=neutron" [testenv:py3-dev] basepython = python3