Switch to use opendev.org

Our cgit instance will be going away and opendev.org is the new
preferred URL for browsing our git repos. Redirects will exist for the
foreseeable future, but it's more efficient to just go directly to the
new locations.

Change-Id: Ic5fa1a8436f57836ad37b752a0cca1cd4f3a21a7

17 files changed, 60 insertions, 60 deletions

diff --git a/README.rst b/README.rst
index 22e576bf3..83a587236 100644
--- a/README.rst
+++ b/README.rst
@@ -22,19 +22,19 @@ Getting Started
 
 If you'd like to run from the master branch, you can clone the git repo:
 
-    git clone https://git.openstack.org/openstack/heat
+    git clone https://opendev.org/openstack/heat
 
 
 * Documentation: https://docs.openstack.org/heat/latest
-* Template samples: https://git.openstack.org/cgit/openstack/heat-templates
-* Agents: https://git.openstack.org/cgit/openstack/heat-agents
+* Template samples: https://opendev.org/openstack/heat-templates
+* Agents: https://opendev.org/openstack/heat-agents
 * Release Notes: https://docs.openstack.org/releasenotes/heat/
 
 Python client
 -------------
 
 * Documentation: https://docs.openstack.org/python-heatclient/latest
-* Source: https://git.openstack.org/cgit/openstack/python-heatclient
+* Source: https://opendev.org/openstack/python-heatclient
 
 Report a Story (a bug/blueprint)
 --------------------------------
@@ -55,21 +55,21 @@ References
 
 We have integration with
 ------------------------
-* https://git.openstack.org/cgit/openstack/python-novaclient (instance)
-* https://git.openstack.org/cgit/openstack/python-keystoneclient (auth)
-* https://git.openstack.org/cgit/openstack/python-swiftclient (object storage)
-* https://git.openstack.org/cgit/openstack/python-neutronclient (networking)
-* https://git.openstack.org/cgit/openstack/python-aodhclient (alarming service)
-* https://git.openstack.org/cgit/openstack/python-cinderclient (block storage)
-* https://git.openstack.org/cgit/openstack/python-glanceclient (image service)
-* https://git.openstack.org/cgit/openstack/python-troveclient (database as a Service)
-* https://git.openstack.org/cgit/openstack/python-saharaclient (hadoop cluster)
-* https://git.openstack.org/cgit/openstack/python-barbicanclient (key management service)
-* https://git.openstack.org/cgit/openstack/python-designateclient (DNS service)
-* https://git.openstack.org/cgit/openstack/python-magnumclient (container service)
-* https://git.openstack.org/cgit/openstack/python-manilaclient (shared file system service)
-* https://git.openstack.org/cgit/openstack/python-mistralclient (workflow service)
-* https://git.openstack.org/cgit/openstack/python-zaqarclient (messaging service)
-* https://git.openstack.org/cgit/openstack/python-monascaclient (monitoring service)
-* https://git.openstack.org/cgit/openstack/python-zunclient (container management service)
-* https://git.openstack.org/cgit/openstack/python-blazarclient (reservation service)
+* https://opendev.org/openstack/python-novaclient (instance)
+* https://opendev.org/openstack/python-keystoneclient (auth)
+* https://opendev.org/openstack/python-swiftclient (object storage)
+* https://opendev.org/openstack/python-neutronclient (networking)
+* https://opendev.org/openstack/python-aodhclient (alarming service)
+* https://opendev.org/openstack/python-cinderclient (block storage)
+* https://opendev.org/openstack/python-glanceclient (image service)
+* https://opendev.org/openstack/python-troveclient (database as a Service)
+* https://opendev.org/openstack/python-saharaclient (hadoop cluster)
+* https://opendev.org/openstack/python-barbicanclient (key management service)
+* https://opendev.org/openstack/python-designateclient (DNS service)
+* https://opendev.org/openstack/python-magnumclient (container service)
+* https://opendev.org/openstack/python-manilaclient (shared file system service)
+* https://opendev.org/openstack/python-mistralclient (workflow service)
+* https://opendev.org/openstack/python-zaqarclient (messaging service)
+* https://opendev.org/openstack/python-monascaclient (monitoring service)
+* https://opendev.org/openstack/python-zunclient (container management service)
+* https://opendev.org/openstack/python-blazarclient (reservation service)
diff --git a/devstack/README.rst b/devstack/README.rst
index 5b6bb9d68..1a6a2581b 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -4,12 +4,12 @@ Enabling heat in DevStack
 
 1. Download DevStack::
 
-     git clone https://git.openstack.org/openstack-dev/devstack
+     git clone https://opendev.org/openstack-dev/devstack
      cd devstack
 
 2. Add this repo as an external repository into your ``local.conf`` file::
 
      [[local|localrc]]
-     enable_plugin heat https://git.openstack.org/openstack/heat
+     enable_plugin heat https://opendev.org/openstack/heat
 
 3. Run ``stack.sh``.
diff --git a/doc/source/contributing/blueprints.rst b/doc/source/contributing/blueprints.rst
index 087178f89..e8d7f74e0 100644
--- a/doc/source/contributing/blueprints.rst
+++ b/doc/source/contributing/blueprints.rst
@@ -2,13 +2,13 @@ Blueprints and Specs
 ====================
 
 The Heat team uses the `heat-specs
-<https://git.openstack.org/cgit/openstack/heat-specs>`_ repository for its
+<https://opendev.org/openstack/heat-specs>`_ repository for its
 specification reviews. Detailed information can be found `here
 <https://wiki.openstack.org/wiki/Blueprints#Heat>`_.
 
 Please note that we use a template for spec submissions. Please use the
 `template for the latest release
-<https://git.openstack.org/cgit/openstack/heat-specs/tree/specs/templates>`_.
+<https://opendev.org/openstack/heat-specs/src/branch/master/specs/templates>`_.
 It is not required to fill out all sections in the template.
 
 You have to create a Story in StoryBoard `heat storyboard
diff --git a/doc/source/getting_started/create_a_stack.rst b/doc/source/getting_started/create_a_stack.rst
index 7ec7e559a..8b8f03dac 100644
--- a/doc/source/getting_started/create_a_stack.rst
+++ b/doc/source/getting_started/create_a_stack.rst
@@ -59,7 +59,7 @@ Launching a stack
 -----------------
 Now lets launch a stack, using an example template from the heat-templates repository::
 
-    $ openstack stack create -t http://git.openstack.org/cgit/openstack/heat-templates/plain/hot/F20/WordPress_Native.yaml --parameter key_name=heat_key --parameter image_id=my-fedora-image --parameter instance_type=m1.small teststack
+    $ openstack stack create -t https://opendev.org/openstack/heat-templates/raw/src/branch/master/hot/F20/WordPress_Native.yaml --parameter key_name=heat_key --parameter image_id=my-fedora-image --parameter instance_type=m1.small teststack
 
 Which will respond::
 
diff --git a/doc/source/getting_started/jeos_building.rst b/doc/source/getting_started/jeos_building.rst
index 0c32461fc..bf54b2c6b 100644
--- a/doc/source/getting_started/jeos_building.rst
+++ b/doc/source/getting_started/jeos_building.rst
@@ -18,7 +18,7 @@ the heat-cfntools_ package installed.
 This document describes some options for creating a heat-cfntools enabled image
 for yourself.
 
-.. _heat-cfntools: https://git.openstack.org/cgit/openstack/heat-cfntools
+.. _heat-cfntools: https://opendev.org/openstack/heat-cfntools
 
 Building an image with diskimage-builder
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -27,14 +27,14 @@ tripleo-image-elements_ is a collection of diskimage-builder elements related
 to the TripleO_ project. It includes an element for heat-cfntools which can be
 used to create heat-enabled images.
 
-.. _diskimage-builder: https://git.openstack.org/cgit/openstack/diskimage-builder
-.. _tripleo-image-elements: https://git.openstack.org/cgit/openstack/tripleo-image-elements
+.. _diskimage-builder: https://opendev.org/openstack/diskimage-builder
+.. _tripleo-image-elements: https://opendev.org/openstack/tripleo-image-elements
 .. _TripleO: https://wiki.openstack.org/wiki/TripleO
 
 Install the tool (preferably in a virtualenv) and fetch the elements::
 
-    pip install git+https://git.openstack.org/openstack/diskimage-builder
-    git clone https://git.openstack.org/openstack/tripleo-image-elements
+    pip install git+https://opendev.org/openstack/diskimage-builder
+    git clone https://opendev.org/openstack/tripleo-image-elements
 
 To create a heat-cfntools enabled image with the current release of Fedora x86_64::
 
@@ -63,9 +63,9 @@ package download failure causing the stack launch to fail.
 To create an image that contains hooks needed for SoftwareConfig and SoftwareDeployment,
 you can follow the steps below to build a fedora based image::
 
-    pip install git+https://git.openstack.org/openstack/diskimage-builder
-    git clone https://git.openstack.org/openstack/tripleo-image-elements
-    git clone https://git.openstack.org/openstack/heat-agents
+    pip install git+https://opendev.org/openstack/diskimage-builder
+    git clone https://opendev.org/openstack/tripleo-image-elements
+    git clone https://opendev.org/openstack/heat-agents
     export ELEMENTS_PATH=tripleo-image-elements/elements:heat-agents
     disk-image-create vm \
         fedora selinux-permissive \
diff --git a/doc/source/getting_started/on_devstack.rst b/doc/source/getting_started/on_devstack.rst
index 8d8412c81..6fb850cc9 100644
--- a/doc/source/getting_started/on_devstack.rst
+++ b/doc/source/getting_started/on_devstack.rst
@@ -39,12 +39,12 @@ plugin add the following to the `[[local|localrc]]` section of `local.conf`::
   [[local|localrc]]
 
   #Enable heat plugin
-  enable_plugin heat https://git.openstack.org/openstack/heat
+  enable_plugin heat https://opendev.org/openstack/heat
 
 To use stable branches, make sure devstack is on that branch,
 and specify the branch name to enable_plugin, for example::
 
-  enable_plugin heat https://git.openstack.org/openstack/heat stable/newton
+  enable_plugin heat https://opendev.org/openstack/heat stable/newton
 
 It would also be useful to automatically download and register
 a VM image that heat can launch. To do that add the following to
@@ -68,8 +68,8 @@ Adding the following lines to `[[local|localrc]]` section of `local.conf`
 will enable the services::
 
     CEILOMETER_BACKEND=mongodb
-    enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer
-    enable_plugin aodh https://git.openstack.org/openstack/aodh
+    enable_plugin ceilometer https://opendev.org/openstack/ceilometer
+    enable_plugin aodh https://opendev.org/openstack/aodh
 
 Configure DevStack to enable OSprofiler
 ---------------------------------------
diff --git a/doc/source/operating_guides/scale_deployment.rst b/doc/source/operating_guides/scale_deployment.rst
index ffcc77d62..c19d3657f 100644
--- a/doc/source/operating_guides/scale_deployment.rst
+++ b/doc/source/operating_guides/scale_deployment.rst
@@ -254,10 +254,10 @@ Running the API and Engine Services
 
 For each machine, B and C, you must do the following steps:
 
-    1. Clone the heat repository https://git.openstack.org/cgit/openstack/heat, run:
+    1. Clone the heat repository https://opendev.org/openstack/heat, run:
 
     ::
-        git clone https://git.openstack.org/openstack/heat
+        git clone https://opendev.org/openstack/heat
 
     2. Create a local copy of the configuration file */etc/heat/heat.conf* from
        the machine A;
diff --git a/doc/source/template_guide/contrib.rst b/doc/source/template_guide/contrib.rst
index a4fa6e9a1..dc9b8f710 100644
--- a/doc/source/template_guide/contrib.rst
+++ b/doc/source/template_guide/contrib.rst
@@ -29,6 +29,6 @@ DockerInc Resource
 This plugin enables the use of  Docker containers in a Heat template and
 requires the `docker-py <https://pypi.org/project/docker-py>`_
 package. You can find more information in the `DOCKER_README
-<https://git.openstack.org/cgit/openstack/heat/tree/contrib/heat_docker/README.md>`_.
+<https://opendev.org/openstack/heat/src/branch/master/contrib/heat_docker/README.md>`_.
 
 .. contribrespages:: DockerInc::
diff --git a/doc/source/template_guide/existing_templates.rst b/doc/source/template_guide/existing_templates.rst
index 7715bd584..7286ab81e 100644
--- a/doc/source/template_guide/existing_templates.rst
+++ b/doc/source/template_guide/existing_templates.rst
@@ -12,12 +12,12 @@ The `OpenStack Heat Templates repository`_ contains example templates
 demonstrating core Heat functionality, related image-building templates,
 and template-related scripts and conversion tools.
 
-.. _OpenStack Heat Templates Repository: https://git.openstack.org/cgit/openstack/heat-templates/tree/
+.. _OpenStack Heat Templates Repository: https://opendev.org/openstack/heat-templates/
 
 The `OpenStack TripleO Heat Templates repository`_ contains a variety of
 heat templates that are included in the tripleo-heat-templates codebase.
 
-.. _OpenStack TripleO Heat Templates repository: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/tree/
+.. _OpenStack TripleO Heat Templates repository: https://opendev.org/openstack/tripleo-heat-templates/
 
 Rackspace has provided a set of Heat templates at the `RCB Ops repository`_
 that can be used by cloud operators to launch applications, templates for
diff --git a/doc/source/template_guide/software_deployment.rst b/doc/source/template_guide/software_deployment.rst
index 4e47c58e0..33f525014 100644
--- a/doc/source/template_guide/software_deployment.rst
+++ b/doc/source/template_guide/software_deployment.rst
@@ -474,11 +474,11 @@ required in later examples:
 
     # Clone the required repositories. Some of these are also available
     # via pypi or as distro packages.
-    git clone https://git.openstack.org/openstack/tripleo-image-elements.git
-    git clone https://git.openstack.org/openstack/heat-agents.git
+    git clone https://opendev.org/openstack/tripleo-image-elements
+    git clone https://opendev.org/openstack/heat-agents
 
     # Install diskimage-builder from source
-    sudo pip install git+https://git.openstack.org/openstack/diskimage-builder.git
+    sudo pip install git+https://opendev.org/openstack/diskimage-builder
 
     # Required by diskimage-builder to discover element collections
     export ELEMENTS_PATH=tripleo-image-elements/elements:heat-agents/
@@ -787,8 +787,8 @@ contents of the file ``example-puppet-manifest.pp``, containing:
 .. _cloud-init: https://cloudinit.readthedocs.io/
 .. _curl: https://curl.haxx.se/
 .. _`Orchestration API`: https://developer.openstack.org/api-ref/orchestration/v1/
-.. _os-refresh-config: https://git.openstack.org/cgit/openstack/os-refresh-config
-.. _os-apply-config: https://git.openstack.org/cgit/openstack/os-apply-config
-.. _tripleo-heat-templates: https://git.openstack.org/cgit/openstack/tripleo-heat-templates
-.. _tripleo-image-elements: https://git.openstack.org/cgit/openstack/tripleo-image-elements
+.. _os-refresh-config: https://opendev.org/openstack/os-refresh-config
+.. _os-apply-config: https://opendev.org/openstack/os-apply-config
+.. _tripleo-heat-templates: https://opendev.org/openstack/tripleo-heat-templates
+.. _tripleo-image-elements: https://opendev.org/openstack/tripleo-image-elements
 .. _puppet: https://puppet.com/
diff --git a/doc/source/templates/cfn/WordPress_Single_Instance.rst b/doc/source/templates/cfn/WordPress_Single_Instance.rst
index 098491c20..92e0dc6af 100644
--- a/doc/source/templates/cfn/WordPress_Single_Instance.rst
+++ b/doc/source/templates/cfn/WordPress_Single_Instance.rst
@@ -15,7 +15,7 @@
 AWS Wordpress Single Instance Template
 ======================================
 
-https://git.openstack.org/cgit/openstack/heat-templates/tree/cfn/F18/WordPress_Single_Instance.template
+https://opendev.org/openstack/heat-templates/src/branch/master/cfn/F18/WordPress_Single_Instance.template
 
 Description
 -----------
diff --git a/doc/source/templates/hot/hello_world.rst b/doc/source/templates/hot/hello_world.rst
index 3e1c0a331..11b840c01 100644
--- a/doc/source/templates/hot/hello_world.rst
+++ b/doc/source/templates/hot/hello_world.rst
@@ -15,7 +15,7 @@
 Hello World HOT Template
 ========================
 
-https://git.openstack.org/cgit/openstack/heat-templates/tree/hot/hello_world.yaml
+https://opendev.org/openstack/heat-templates/src/branch/master/hot/hello_world.yaml
 
 Description
 -----------
diff --git a/doc/source/templates/index.rst b/doc/source/templates/index.rst
index e56170859..037bc99a6 100644
--- a/doc/source/templates/index.rst
+++ b/doc/source/templates/index.rst
@@ -15,7 +15,7 @@
 Example Templates
 =================
 
-This page documents the templates at https://git.openstack.org/cgit/openstack/heat-templates/
+This page documents the templates at https://opendev.org/openstack/heat-templates/
 
 Example HOT Templates
 =====================
diff --git a/heat/db/sqlalchemy/migrate_repo/README b/heat/db/sqlalchemy/migrate_repo/README
index 4ea8dd4f9..131117104 100644
--- a/heat/db/sqlalchemy/migrate_repo/README
+++ b/heat/db/sqlalchemy/migrate_repo/README
@@ -1,4 +1,4 @@
 This is a database migration repository.
 
 More information at
-https://git.openstack.org/cgit/openstack/sqlalchemy-migrate
+https://opendev.org/openstack/sqlalchemy-migrate
diff --git a/rally-scenarios/plugins/sample_plugin.py b/rally-scenarios/plugins/sample_plugin.py
index fd541cf02..2e40de512 100644
--- a/rally-scenarios/plugins/sample_plugin.py
+++ b/rally-scenarios/plugins/sample_plugin.py
@@ -16,7 +16,7 @@
 """Sample plugin for Heat.
 
 For more Heat related benchmarks take a look here:
-https://git.openstack.org/cgit/openstack/rally/tree/rally/plugins/openstack/scenarios/heat
+https://opendev.org/openstack/heat/src/branch/master/rally-scenarios
 
 About plugins: https://rally.readthedocs.io/en/latest/plugins/#rally-plugins
 
@@ -31,6 +31,6 @@ class HeatPlugin(scenario.OpenStackScenario):
 
     @scenario.configure(context={"cleanup": ["heat"]})
     def list_benchmark(self, container_format,
-                            image_location, disk_format, **kwargs):
+                       image_location, disk_format, **kwargs):
         """Get heatclient and do whatever."""
-        stacks = list(self.clients("heat").stacks.list())
+        list(self.clients("heat").stacks.list())
diff --git a/tools/README.rst b/tools/README.rst
index ab24decd7..f352e8868 100644
--- a/tools/README.rst
+++ b/tools/README.rst
@@ -32,7 +32,7 @@ Review dashboards
 Generate gerrit review URL for heat. This can pop up some patches
 that might requires reviews. You can generate it with following
 command under `gerrit-dash-creator` repo
-( https://git.openstack.org/cgit/openstack/gerrit-dash-creator )
+( https://opendev.org/openstack/gerrit-dash-creator )
 
     $ ./gerrit-dash-creator heat.dash
 
diff --git a/tox.ini b/tox.ini
index c8b2dab6d..0063c8948 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ setenv = VIRTUAL_ENV={envdir}
          PYTHONWARNINGS=default::DeprecationWarning
          OS_TEST_PATH=heat/tests
 usedevelop = True
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/src/branch/master/upper-constraints.txt} {opts} {packages}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =