From f6a45448ad0ac197dcb3461c9d76395e1f0231c0 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 14 Nov 2019 16:57: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: I87cf6db6e5497ea3c69242b4eaffad7f533448c7 --- defaults/main.yml | 4 ++-- releasenotes/source/conf.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index b9da856..78548b8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -27,9 +27,9 @@ masakari_service_setup_host_python_interpreter: "{{ openstack_service_setup_host masakari_package_state: "latest" masakari_pip_package_state: "latest" -masakari_git_repo: https://git.openstack.org/openstack/masakari +masakari_git_repo: https://opendev.org/openstack/masakari masakari_git_install_branch: master -masakari_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')) }}" +masakari_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" masakari_git_constraints: - "git+{{ masakari_git_repo }}@{{ masakari_git_install_branch }}#egg=masakari" - "--constraint {{ masakari_upper_constraints_url }}" diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index ef0a41d..614a393 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