diff --git a/defaults/main.yml b/defaults/main.yml index f7d37ed6..cb6721f5 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -35,9 +35,9 @@ ironic_glance_api_servers: "{{ (glance_service_internalurl | default('http://loc ironic_package_state: "latest" ironic_pip_package_state: "latest" -ironic_git_repo: https://git.openstack.org/openstack/ironic +ironic_git_repo: https://opendev.org/openstack/ironic ironic_git_install_branch: master -ironic_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')) }}" +ironic_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" ironic_git_constraints: - "git+{{ ironic_git_repo }}@{{ ironic_git_install_branch }}#egg=ironic" - "--constraint {{ ironic_upper_constraints_url }}" diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 8de8eeda..7167d928 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