From 9b6d2f20b47523ddc51349943dd76bb76d1c58d8 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Tue, 18 Jun 2019 10:43:16 -0400 Subject: [PATCH] Update (git|review).openstack.org links to opendev This updates links going to git.openstack.org and review.openstack.org to go to their respective opendev locations to avoid redirects. Change-Id: I78e3bb5303718962f591117f9c0ee11f2314b128 Closes-Bug: #1833256 --- HACKING.rst | 4 ++-- README.rst | 2 +- doc/source/configuration.rst | 6 +++--- doc/source/faq.rst | 3 +-- doc/source/guides/devstack-with-lbaas-v2.rst | 6 +++--- doc/source/guides/lxc.rst | 2 +- doc/source/guides/multinode-lab.rst | 2 +- doc/source/guides/neutron.rst | 4 ++-- doc/source/guides/nova.rst | 2 +- doc/source/guides/single-machine.rst | 2 +- doc/source/guides/single-vm.rst | 2 +- doc/source/index.rst | 5 ++--- doc/source/plugins.rst | 15 +++++++++++---- doc/source/zuul_ci_jobs_migration.rst | 10 +++++----- inc/python | 2 +- tools/fixup_stuff.sh | 2 +- tools/generate-devstack-plugins-list.py | 4 ++-- tools/install_pip.sh | 2 +- 18 files changed, 40 insertions(+), 35 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index 968306a2c4..f6951064ae 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -11,7 +11,7 @@ Shell script was chosen because it best illustrates the steps used to set up and interact with OpenStack components. DevStack's official repository is located on git.openstack.org at -https://git.openstack.org/openstack-dev/devstack. Besides the master branch that +https://opendev.org/openstack/devstack. Besides the master branch that tracks the OpenStack trunk branches a separate branch is maintained for all OpenStack releases starting with Diablo (stable/diablo). @@ -26,7 +26,7 @@ __ lp_ .. _lp: https://launchpad.net/~devstack The `Gerrit review -queue `__ +queue `__ is used for all commits. The primary script in DevStack is ``stack.sh``, which performs the bulk of the diff --git a/README.rst b/README.rst index ad7ede45c5..f3a585a926 100644 --- a/README.rst +++ b/README.rst @@ -38,7 +38,7 @@ You can also pick specific OpenStack project releases by setting the appropriate `stackrc` for the default set). Usually just before a release there will be milestone-proposed branches that need to be tested:: - GLANCE_REPO=https://git.openstack.org/openstack/glance.git + GLANCE_REPO=https://opendev.org/openstack/glance.git GLANCE_BRANCH=milestone-proposed Start A Dev Cloud diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 098e994ccd..0105d5e636 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -205,7 +205,7 @@ Historical Notes Historically DevStack obtained all local configuration and customizations from a ``localrc`` file. In Oct 2013 the ``local.conf`` configuration method was introduced (in `review 46768 -`__) to simplify this +`__) to simplify this process. Configuration Notes @@ -232,13 +232,13 @@ proposal. ``GIT_BASE`` points to the primary repository server. To pull a branch directly from Gerrit, get the repo and branch from the Gerrit review page:: - git fetch https://review.openstack.org/p/openstack/nova \ + git fetch https://review.opendev.org/openstack/nova \ refs/changes/50/5050/1 && git checkout FETCH_HEAD The repo is the stanza following ``fetch`` and the branch is the stanza following that:: - NOVA_REPO=https://review.openstack.org/p/openstack/nova + NOVA_REPO=https://review.opendev.org/openstack/nova NOVA_BRANCH=refs/changes/50/5050/1 diff --git a/doc/source/faq.rst b/doc/source/faq.rst index efb315cbee..8214de0f6a 100644 --- a/doc/source/faq.rst +++ b/doc/source/faq.rst @@ -80,8 +80,7 @@ I'd like to help! ~~~~~~~~~~~~~~~~~ That isn't a question, but please do! The source for DevStack is at -`git.openstack.org -`__ and bug +`opendev.org `__ and bug reports go to `LaunchPad `__. Contributions follow the usual process as described in the `developer guide diff --git a/doc/source/guides/devstack-with-lbaas-v2.rst b/doc/source/guides/devstack-with-lbaas-v2.rst index db138ae2c5..07a9bb33cc 100644 --- a/doc/source/guides/devstack-with-lbaas-v2.rst +++ b/doc/source/guides/devstack-with-lbaas-v2.rst @@ -19,7 +19,7 @@ Install devstack :: - git clone https://git.openstack.org/openstack-dev/devstack + git clone https://opendev.org/openstack/devstack cd devstack/tools sudo ./create-stack-user.sh cd ../.. @@ -35,9 +35,9 @@ Edit your ``/opt/stack/devstack/local.conf`` to look like :: [[local|localrc]] - enable_plugin octavia https://git.openstack.org/openstack/octavia + enable_plugin octavia https://opendev.org/openstack/octavia # If you are enabling horizon, include the octavia dashboard - # enable_plugin octavia-dashboard https://git.openstack.org/openstack/octavia-dashboard.git + # enable_plugin octavia-dashboard https://opendev.org/openstack/octavia-dashboard.git # If you are enabling barbican for TLS offload in Octavia, include it here. # enable_plugin barbican https://github.com/openstack/barbican.git diff --git a/doc/source/guides/lxc.rst b/doc/source/guides/lxc.rst index 9549ed2974..dcaa4166c4 100644 --- a/doc/source/guides/lxc.rst +++ b/doc/source/guides/lxc.rst @@ -105,7 +105,7 @@ The commands in this section should all be run inside your container. :: - git clone https://git.openstack.org/openstack-dev/devstack + git clone https://opendev.org/openstack/devstack #. Configure diff --git a/doc/source/guides/multinode-lab.rst b/doc/source/guides/multinode-lab.rst index 3c4acc8c7c..15f02a0e5e 100644 --- a/doc/source/guides/multinode-lab.rst +++ b/doc/source/guides/multinode-lab.rst @@ -103,7 +103,7 @@ Grab the latest version of DevStack: :: - git clone https://git.openstack.org/openstack-dev/devstack + git clone https://opendev.org/openstack/devstack cd devstack Up to this point all of the steps apply to each node in the cluster. diff --git a/doc/source/guides/neutron.rst b/doc/source/guides/neutron.rst index 80b2f85285..2c25a1c350 100644 --- a/doc/source/guides/neutron.rst +++ b/doc/source/guides/neutron.rst @@ -567,7 +567,7 @@ you do not require them. Q_ML2_PLUGIN_MECHANISM_DRIVERS=macvtap Q_USE_PROVIDER_NETWORKING=True - enable_plugin neutron https://git.openstack.org/openstack/neutron + enable_plugin neutron https://opendev.org/openstack/neutron ## MacVTap agent options Q_AGENT=macvtap @@ -622,7 +622,7 @@ For the MacVTap compute node, use this local.conf: # Services that a compute node runs disable_all_services - enable_plugin neutron https://git.openstack.org/openstack/neutron + enable_plugin neutron https://opendev.org/openstack/neutron ENABLED_SERVICES+=n-cpu,q-agt ## MacVTap agent options diff --git a/doc/source/guides/nova.rst b/doc/source/guides/nova.rst index 65491d13e8..2271e2321b 100644 --- a/doc/source/guides/nova.rst +++ b/doc/source/guides/nova.rst @@ -83,7 +83,7 @@ some fake resource inventory values and keeps track of the state of the compute API but is good enough for most API testing, and is also used within the nova functional tests themselves so is fairly robust. -.. _fake virt driver: http://git.openstack.org/cgit/openstack/nova/tree/nova/virt/fake.py +.. _fake virt driver: https://opendev.org/openstack/nova/src/branch/master/nova/virt/fake.py Configuration ------------- diff --git a/doc/source/guides/single-machine.rst b/doc/source/guides/single-machine.rst index cfbd6b1884..a0e97edb37 100644 --- a/doc/source/guides/single-machine.rst +++ b/doc/source/guides/single-machine.rst @@ -74,7 +74,7 @@ We'll grab the latest version of DevStack via https: .. code-block:: console $ sudo apt-get install git -y || sudo yum install -y git - $ git clone https://git.openstack.org/openstack-dev/devstack + $ git clone https://opendev.org/openstack/devstack $ cd devstack Run DevStack diff --git a/doc/source/guides/single-vm.rst b/doc/source/guides/single-vm.rst index 45b8f2dd89..8ebf2a638d 100644 --- a/doc/source/guides/single-vm.rst +++ b/doc/source/guides/single-vm.rst @@ -60,7 +60,7 @@ passed as the user-data file when booting the VM. DEBIAN_FRONTEND=noninteractive sudo apt-get install -qqy git || sudo yum install -qy git sudo chown stack:stack /home/stack cd /home/stack - git clone https://git.openstack.org/openstack-dev/devstack + git clone https://opendev.org/openstack/devstack cd devstack echo '[[local|localrc]]' > local.conf echo ADMIN_PASSWORD=password >> local.conf diff --git a/doc/source/index.rst b/doc/source/index.rst index 1ea1c5ddae..8f958585ee 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -23,8 +23,7 @@ everything from git master. It is used interactively as a development environment and as the basis for much of the OpenStack project's functional testing. -The source is available at -``__. +The source is available at ``__. .. warning:: @@ -73,7 +72,7 @@ Download DevStack .. code-block:: console - $ git clone https://git.openstack.org/openstack-dev/devstack + $ git clone https://opendev.org/openstack/devstack $ cd devstack The ``devstack`` repo contains a script that installs OpenStack and diff --git a/doc/source/plugins.rst b/doc/source/plugins.rst index b1f2397454..09ba980548 100644 --- a/doc/source/plugins.rst +++ b/doc/source/plugins.rst @@ -99,7 +99,7 @@ They are added in the following format:: An example would be as follows:: - enable_plugin ec2-api https://git.openstack.org/openstack/ec2-api + enable_plugin ec2-api https://opendev.org/openstack/ec2-api plugin.sh contract ================== @@ -264,10 +264,12 @@ integration of alternate RPC systems (e.g. zmq, qpid). In these cases the best practice is to build a dedicated ``openstack/devstack-plugin-FOO`` project. +Legacy project-config jobs +-------------------------- + To enable a plugin to be used in a gate job, the following lines will be needed in your ``jenkins/jobs/.yaml`` definition in -`project-config -`_:: +`project-config `_:: # Because we are testing a non standard project, add the # our project repository. This makes zuul do the right @@ -277,7 +279,12 @@ be needed in your ``jenkins/jobs/.yaml`` definition in # note the actual url here is somewhat irrelevant because it # caches in nodepool, however make it a valid url for # documentation purposes. - export DEVSTACK_LOCAL_CONFIG="enable_plugin ec2-api https://git.openstack.org/openstack/ec2-api" + export DEVSTACK_LOCAL_CONFIG="enable_plugin ec2-api https://opendev.org/openstack/ec2-api" + +Zuul v3 jobs +------------ + +See the ``devstack_plugins`` example in :doc:`zuul_ci_jobs_migration`. See Also ======== diff --git a/doc/source/zuul_ci_jobs_migration.rst b/doc/source/zuul_ci_jobs_migration.rst index 633f951d3d..dbb79893db 100644 --- a/doc/source/zuul_ci_jobs_migration.rst +++ b/doc/source/zuul_ci_jobs_migration.rst @@ -28,7 +28,7 @@ sahara Tempest plugin repo: .. code:: yaml - # In http://git.openstack.org/cgit/openstack/sahara-tests/tree/.zuul.yaml: + # In https://opendev.org/openstack/sahara-tests/src/branch/master/.zuul.yaml: - job: name: sahara-tests-tempest description: | @@ -86,7 +86,7 @@ job.parent. .. code:: yaml - # https://git.openstack.org/cgit/openstack/kuryr-kubernetes/tree/.zuul.yaml: + # https://opendev.org/openstack/kuryr-kubernetes/src/branch/master/.zuul.d/base.yaml: - job: name: kuryr-kubernetes-tempest-base parent: devstack-tempest @@ -110,9 +110,9 @@ job.parent. kuryr-kubernetes: true (...) devstack_plugins: - kuryr-kubernetes: https://git.openstack.org/openstack/kuryr - devstack-plugin-container: https://git.openstack.org/openstack/devstack-plugin-container - neutron-lbaas: https://git.openstack.org/openstack/neutron-lbaas + kuryr-kubernetes: https://opendev.org/openstack/kuryr + devstack-plugin-container: https://opendev.org/openstack/devstack-plugin-container + neutron-lbaas: https://opendev.org/openstack/neutron-lbaas tempest_plugins: - kuryr-tempest-plugin (...) diff --git a/inc/python b/inc/python index 0e575ae9e9..ea8ff67e08 100644 --- a/inc/python +++ b/inc/python @@ -346,7 +346,7 @@ function lib_installed_from_git { # The best option seems to be to use "pip list" which will tell # you the path an editable install was installed from; for example # in response to something like - # pip install -e 'git+http://git.openstack.org/openstack-dev/bashate#egg=bashate' + # pip install -e 'git+https://opendev.org/openstack/bashate#egg=bashate' # pip list --format columns shows # bashate 0.5.2.dev19 /tmp/env/src/bashate # Thus we check the third column to see if we're installed from diff --git a/tools/fixup_stuff.sh b/tools/fixup_stuff.sh index 748223902c..1fa053f457 100755 --- a/tools/fixup_stuff.sh +++ b/tools/fixup_stuff.sh @@ -255,7 +255,7 @@ function fixup_suse { # looking for the mirror config script before doing this, and just # skip it if so. -# [1] https://git.openstack.org/cgit/openstack/diskimage-builder/tree/ \ +# [1] https://opendev.org/openstack/diskimage-builder/src/branch/master/ \ # diskimage_builder/elements/pip-and-virtualenv/ \ # install.d/pip-and-virtualenv-source-install/04-install-pip # [2] https://bugzilla.redhat.com/show_bug.cgi?id=1477823 diff --git a/tools/generate-devstack-plugins-list.py b/tools/generate-devstack-plugins-list.py index 580560ccab..11062eab2b 100644 --- a/tools/generate-devstack-plugins-list.py +++ b/tools/generate-devstack-plugins-list.py @@ -19,9 +19,9 @@ # # In order to function correctly, the environment in which the # script runs must have -# * network access to the review.openstack.org Gerrit API +# * network access to the review.opendev.org Gerrit API # working directory -# * network access to https://git.openstack.org/cgit +# * network access to https://opendev.org/ import functools import logging diff --git a/tools/install_pip.sh b/tools/install_pip.sh index 1bd7392b9d..2b6aa4c2e8 100755 --- a/tools/install_pip.sh +++ b/tools/install_pip.sh @@ -35,7 +35,7 @@ FILES=$TOP_DIR/files # done by openstack-infra diskimage-builder elements as part of image # preparation [1]. This prevents any network access, which can be # unreliable in CI situations. -# [1] http://git.openstack.org/cgit/openstack-infra/project-config/tree/nodepool/elements/cache-devstack/source-repository-pip +# [1] https://opendev.org/openstack/project-config/src/branch/master/nodepool/elements/cache-devstack/source-repository-pip PIP_GET_PIP_URL=${PIP_GET_PIP_URL:-"https://bootstrap.pypa.io/get-pip.py"} LOCAL_PIP="$FILES/$(basename $PIP_GET_PIP_URL)"