diff --git a/defaults/main.yml b/defaults/main.yml index c2f6a1e..04d01a6 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -79,9 +79,9 @@ trove_pip_install_args: "{{ pip_install_options | default('') }}" trove_venv_tag: "{{ venv_tag | default('untagged') }}" trove_bin: "/openstack/venvs/trove-{{ trove_venv_tag }}/bin" -trove_git_repo: "https://git.openstack.org/openstack/trove" +trove_git_repo: "https://opendev.org/openstack/trove" trove_git_install_branch: master -trove_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')) }}" +trove_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" trove_git_constraints: - "git+{{ trove_git_repo }}@{{ trove_git_install_branch }}#egg=trove" - "--constraint {{ trove_upper_constraints_url }}" diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 07ddcfd..910422c 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/tests/os_trove-overrides.yml b/tests/os_trove-overrides.yml index a153302..9ab4991 100644 --- a/tests/os_trove-overrides.yml +++ b/tests/os_trove-overrides.yml @@ -33,7 +33,7 @@ tempest_run: yes tempest_plugins: - name: trove - repo: https://git.openstack.org/openstack/trove-tempest-plugin + repo: https://opendev.org/openstack/trove-tempest-plugin branch: master tempest_test_whitelist: