From fa7b62fca2877dd1f6e32a2a28947beb75ed394d Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <drabotyagov@vexxhost.com>
Date: Thu, 14 Nov 2019 18:02:58 +0200
Subject: [PATCH] Replace git.openstack.org with opendev.org

This patch replaces git.openstack.org with opendev.org as redirection
from old path was enabled.
Also we change upper constraints url due to [1]

[1] http://lists.openstack.org/pipermail/openstack-discuss/2019-May/006478.html

Change-Id: I7d232d94f9c4e9f6493045245f60475f233b185d
---
 defaults/main.yml                |  4 ++--
 doc/source/configure-octavia.rst | 12 ++++++------
 releasenotes/source/conf.py      |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index c427d41b..fbc7872a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -47,9 +47,9 @@ octavia_legacy_policy: False
 octavia_package_state: "latest"
 octavia_pip_package_state: "latest"
 
-octavia_git_repo: https://git.openstack.org/openstack/octavia
+octavia_git_repo: https://opendev.org/openstack/octavia
 octavia_git_install_branch: master
-octavia_upper_constraints_url: "{{ requirements_git_url | default('https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=' ~ requirements_git_install_branch | default('master')) }}"
+octavia_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}"
 octavia_git_constraints:
   - "git+{{ octavia_git_repo }}@{{ octavia_git_install_branch }}#egg=octavia"
   - "--constraint {{ octavia_upper_constraints_url }}"
diff --git a/doc/source/configure-octavia.rst b/doc/source/configure-octavia.rst
index eeafee7d..37535232 100644
--- a/doc/source/configure-octavia.rst
+++ b/doc/source/configure-octavia.rst
@@ -100,8 +100,8 @@ For this process, use one of the physical hosts within the environment.
 
    .. code-block:: bash
 
-     git clone https://github.com/openstack/octavia.git
-     git clone https://git.openstack.org/openstack/diskimage-builder.git
+     git clone https://opendev.org/openstack/octavia.git
+     git clone https://opendev.org/openstack/diskimage-builder.git
 
 
 #. Run Octavia's diskimage script
@@ -125,7 +125,7 @@ For this process, use one of the physical hosts within the environment.
         ansible with an appropriate tag.
 
 You can find more information abpout the diskimage script and the process at
-https://github.com/openstack/octavia/tree/master/diskimage-create
+https://opendev.org/openstack/octavia/tree/master/diskimage-create
 
 Here is a script to perform all those tasks at once:
 
@@ -136,8 +136,8 @@ Here is a script to perform all those tasks at once:
           pip -v >/dev/null || {apt-get install python-pip}
           pip install argparse Babel>=1.3 dib-utils PyYAML
           pushd /tmp
-          git clone https://github.com/openstack/octavia.git
-          git clone https://git.openstack.org/openstack/diskimage-builder.git
+          git clone https://opendev.org/openstack/octavia.git
+          git clone https://opendev.org/openstack/diskimage-builder.git
           pushd  octavia/diskimage-create
           ./diskimage-create.sh
           mv amphora-x64-haproxy.qcow2 /tmp
@@ -150,7 +150,7 @@ Here is a script to perform all those tasks at once:
 .. note::
     If you have trouble installing dib-utils from pipy consider
     installing it directly from source
-    `pip install git+https://github.com/openstack/dib-utils.git`
+    `pip install git+https://opendev.org/openstack/dib-utils.git`
 
 Creating the cryptographic certificates
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index befe8a82..d43c36c8 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -64,7 +64,7 @@ title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role'
 
 # The link to the browsable source code (for the left hand menu)
 oslosphinx_cgit_link = (
-    "https://git.openstack.org/cgit/openstack/{}".format(target_name)
+    "https://opendev.org/openstack/{}".format(target_name)
 )
 
 # Release notes do not need a version number in the title, they