From 72e0a52d533683535bd67bffa80cf63b5e47beda Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 14 Nov 2019 17:19:40 +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: I4f6fc9144bee0cf49326cc9df8b0f972d8bd5064 --- defaults/main.yml | 4 ++-- releasenotes/source/conf.py | 2 +- tox.ini | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index e7903a27..83774cb0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -47,10 +47,10 @@ nova_pip_package_state: "latest" nova_install_method: "source" nova_venv_python_executable: "{{ openstack_venv_python_executable | default('python2') }}" -nova_git_repo: https://git.openstack.org/openstack/nova +nova_git_repo: https://opendev.org/openstack/nova nova_git_install_branch: master -nova_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')) }}" +nova_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" nova_git_constraints: - "git+{{ nova_git_repo }}@{{ nova_git_install_branch }}#egg=nova" - "--constraint {{ nova_upper_constraints_url }}" diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index e0366b59..1e77e838 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 diff --git a/tox.ini b/tox.ini index 1c57b723..537bdb66 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = docs,linters,functional [testenv] usedevelop = True install_command = - pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} {opts} {packages} + pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages} commands = /usr/bin/find . -type f -name "*.pyc" -delete passenv =