diff --git a/README.rst b/README.rst index 4dd07756..64f66beb 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,7 @@ Release notes for the project can be found at: https://docs.openstack.org/releasenotes/openstack-ansible-os_glance/ The project source code repository is located at: - https://git.openstack.org/cgit/openstack/openstack-ansible-os_glance/ + https://opendev.org/openstack/openstack-ansible-os_glance/ The project home is at: https://launchpad.net/openstack-ansible diff --git a/defaults/main.yml b/defaults/main.yml index 57c6ae67..6c8733c4 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -30,9 +30,9 @@ glance_service_setup_host_python_interpreter: "{{ openstack_service_setup_host_p glance_package_state: "latest" glance_pip_package_state: "latest" -glance_git_repo: https://git.openstack.org/openstack/glance +glance_git_repo: https://opendev.org/openstack/glance glance_git_install_branch: master -glance_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')) }}" +glance_upper_constraints_url: "{{ requirements_git_url | default('https://opendev.org/openstack/requirements/raw/' ~ requirements_git_install_branch | default('master') ~ '/upper-constraints.txt') }}" glance_git_constraints: - "git+{{ glance_git_repo }}@{{ glance_git_install_branch }}#egg=glance" - "--constraint {{ glance_upper_constraints_url }}" diff --git a/doc/source/conf.py b/doc/source/conf.py index efbe0289..77df7448 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -68,7 +68,7 @@ title = 'OpenStack-Ansible Documentation: ' + 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) ) # The version info for the project you're documenting, acts as replacement for diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index f2f0dfcc..deb0271e 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/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 6fe68f90..8961a500 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -1,65 +1,65 @@ --- - name: apt_package_pinning - src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning + src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning scm: git version: master - name: pip_install - src: https://git.openstack.org/openstack/openstack-ansible-pip_install + src: https://opendev.org/openstack/openstack-ansible-pip_install scm: git version: master - name: memcached_server - src: https://git.openstack.org/openstack/openstack-ansible-memcached_server + src: https://opendev.org/openstack/openstack-ansible-memcached_server scm: git version: master - name: openstack_hosts - src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts + src: https://opendev.org/openstack/openstack-ansible-openstack_hosts scm: git version: master - name: lxc_hosts - src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts + src: https://opendev.org/openstack/openstack-ansible-lxc_hosts scm: git version: master - name: lxc_container_create - src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create + src: https://opendev.org/openstack/openstack-ansible-lxc_container_create scm: git version: master - name: galera_client - src: https://git.openstack.org/openstack/openstack-ansible-galera_client + src: https://opendev.org/openstack/openstack-ansible-galera_client scm: git version: master - name: galera_server - src: https://git.openstack.org/openstack/openstack-ansible-galera_server + src: https://opendev.org/openstack/openstack-ansible-galera_server scm: git version: master - name: rabbitmq_server - src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server + src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server scm: git version: master - name: os_keystone - src: https://git.openstack.org/openstack/openstack-ansible-os_keystone + src: https://opendev.org/openstack/openstack-ansible-os_keystone scm: git version: master - name: openstack_openrc - src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc + src: https://opendev.org/openstack/openstack-ansible-openstack_openrc scm: git version: master - name: ceph_client - src: https://git.openstack.org/openstack/openstack-ansible-ceph_client + src: https://opendev.org/openstack/openstack-ansible-ceph_client scm: git version: master - name: os_tempest - src: https://git.openstack.org/openstack/openstack-ansible-os_tempest + src: https://opendev.org/openstack/openstack-ansible-os_tempest scm: git version: master - name: systemd_service - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service scm: git version: master - name: systemd_mount - src: https://git.openstack.org/openstack/ansible-role-systemd_mount + src: https://opendev.org/openstack/ansible-role-systemd_mount scm: git version: master - name: python_venv_build - src: https://git.openstack.org/openstack/ansible-role-python_venv_build + src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git version: master diff --git a/tox.ini b/tox.ini index 74987d51..f8395e74 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://git.openstack.org/cgit/openstack/requirements/plain/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 =