diff --git a/README.rst b/README.rst index c95f60c0..85e9f850 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,7 @@ Release notes for the project can be found at: ``_ The project source code repository is located at: -``_ +``_ The project home is at: ``_ diff --git a/defaults/main.yml b/defaults/main.yml index 6487ffb0..b397e370 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -33,9 +33,9 @@ keystone_install_method: "source" # Role standard API override this option in the OS variable files keystone_shibboleth_repo: {} -keystone_git_repo: https://git.openstack.org/openstack/keystone +keystone_git_repo: https://opendev.org/openstack/keystone keystone_git_install_branch: master -keystone_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')) }}" +keystone_upper_constraints_url: "{{ requirements_git_url | default('https://opendev.org/openstack/requirements/raw/' ~ requirements_git_install_branch | default('master') ~ '/upper-constraints.txt') }}" keystone_git_constraints: - "git+{{ keystone_git_repo }}@{{ keystone_git_install_branch }}#egg=keystone" - "--constraint {{ keystone_upper_constraints_url }}" diff --git a/doc/source/conf.py b/doc/source/conf.py index 6b861a8d..a9e0b8b3 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/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 4222817a..57deb533 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -1,57 +1,57 @@ --- - 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: haproxy_server - src: https://git.openstack.org/openstack/openstack-ansible-haproxy_server + src: https://opendev.org/openstack/openstack-ansible-haproxy_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: 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: 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: 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 - 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 diff --git a/tests/os_keystone-overrides.yml b/tests/os_keystone-overrides.yml index 0bf888e4..04355a31 100644 --- a/tests/os_keystone-overrides.yml +++ b/tests/os_keystone-overrides.yml @@ -20,7 +20,7 @@ tempest_run: yes tempest_plugins: - name: keystone-tempest-plugin - repo: https://git.openstack.org/openstack/keystone-tempest-plugin + repo: https://opendev.org/openstack/keystone-tempest-plugin branch: master tempest_test_whitelist: diff --git a/tox.ini b/tox.ini index b911dd41..e9948bb9 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://opendev.org/openstack/requirements/raw/upper-constraints.txt} {opts} {packages} commands = /usr/bin/find . -type f -name "*.pyc" -delete passenv =