diff --git a/defaults/main.yml b/defaults/main.yml index 43612f7f..292a9299 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -51,28 +51,28 @@ neutron_venv_python_executable: "{{ openstack_venv_python_executable | default(' neutron_pip_package_state: "latest" # Source git repo/branch settings -neutron_git_repo: https://git.openstack.org/openstack/neutron +neutron_git_repo: https://opendev.org/openstack/neutron neutron_git_install_branch: master -neutron_fwaas_git_repo: https://git.openstack.org/openstack/neutron-fwaas +neutron_fwaas_git_repo: https://opendev.org/openstack/neutron-fwaas neutron_fwaas_git_install_branch: master -neutron_vpnaas_git_repo: https://git.openstack.org/openstack/neutron-vpnaas +neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas neutron_vpnaas_git_install_branch: master -neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dynamic-routing +neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing neutron_dynamic_routing_git_install_branch: master -networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico +networking_calico_git_repo: https://opendev.org/openstack/networking-calico networking_calico_git_install_branch: master -networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl +networking_odl_git_repo: https://opendev.org/openstack/networking-odl networking_odl_git_install_branch: master -networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc +networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc networking_sfc_git_install_branch: master -networking_bgpvpn_git_repo: https://git.openstack.org/openstack/networking-bgpvpn +networking_bgpvpn_git_repo: https://opendev.org/openstack/networking-bgpvpn networking_bgpvpn_git_install_branch: master -openstack_ceilometer_git_repo: https://git.openstack.org/openstack/ceilometer +openstack_ceilometer_git_repo: https://opendev.org/openstack/ceilometer openstack_ceilometer_git_install_branch: master -networking_ovn_git_repo: https://git.openstack.org/openstack/networking-ovn +networking_ovn_git_repo: https://opendev.org/openstack/networking-ovn networking_ovn_git_install_branch: master -neutron_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')) }}" +neutron_upper_constraints_url: "{{ requirements_git_url | default('https://releases.openstack.org/constraints/upper/' ~ requirements_git_install_branch | default('master')) }}" neutron_git_constraints: - "git+{{ neutron_git_repo }}@{{ neutron_git_install_branch }}#egg=neutron" - "git+{{ neutron_fwaas_git_repo }}@{{ neutron_fwaas_git_install_branch }}#egg=neutron-fwaas" diff --git a/doc/source/conf.py b/doc/source/conf.py index e602dbec..ed472ad7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -66,7 +66,7 @@ title = 'OpenStack-Ansible Documentation: ' + role_name + ' role' # The link to the browsable source code (for the left hand menu) oslosphinx_cgit_link = ( - 'https://opendev.org/cgit/openstack/{}'.format(target_name) + 'https://opendev.org/openstack/{}'.format(target_name) ) # openstackdocstheme options diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 9988f2d1..12b75729 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -63,7 +63,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://opendev.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/neutron-overrides-calico.yml b/tests/neutron-overrides-calico.yml index 86f2368d..ce95baff 100644 --- a/tests/neutron-overrides-calico.yml +++ b/tests/neutron-overrides-calico.yml @@ -17,10 +17,10 @@ tempest_run: yes tempest_plugins: - name: neutron - repo: https://git.openstack.org/openstack/neutron + repo: https://opendev.org/openstack/neutron branch: master - name: neutron-plugins - repo: https://git.openstack.org/openstack/neutron-tempest-plugin + repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master tempest_test_whitelist: diff --git a/tests/neutron-overrides-odl-sfc.yml b/tests/neutron-overrides-odl-sfc.yml index 410004d7..baaa76fc 100644 --- a/tests/neutron-overrides-odl-sfc.yml +++ b/tests/neutron-overrides-odl-sfc.yml @@ -35,10 +35,10 @@ tempest_run: yes tempest_plugins: - name: neutron - repo: https://git.openstack.org/openstack/neutron + repo: https://opendev.org/openstack/neutron branch: master - name: neutron-plugins - repo: https://git.openstack.org/openstack/neutron-tempest-plugin + repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master tempest_test_whitelist: diff --git a/tests/neutron-overrides-opendaylight-bgpvpn.yml b/tests/neutron-overrides-opendaylight-bgpvpn.yml index d5e4a93a..1e6979b1 100644 --- a/tests/neutron-overrides-opendaylight-bgpvpn.yml +++ b/tests/neutron-overrides-opendaylight-bgpvpn.yml @@ -45,13 +45,13 @@ tempest_run: yes tempest_plugins: - name: neutron - repo: https://git.openstack.org/openstack/neutron + repo: https://opendev.org/openstack/neutron branch: master - name: neutron-plugins - repo: https://git.openstack.org/openstack/neutron-tempest-plugin + repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master - name: networking-bgpvpn - repo: https://git.openstack.org/openstack/networking-bgpvpn + repo: https://opendev.org/openstack/networking-bgpvpn branch: master tempest_test_whitelist: diff --git a/tests/neutron-overrides-opendaylight.yml b/tests/neutron-overrides-opendaylight.yml index 5b1522f3..eb259b53 100644 --- a/tests/neutron-overrides-opendaylight.yml +++ b/tests/neutron-overrides-opendaylight.yml @@ -33,10 +33,10 @@ tempest_run: yes tempest_plugins: - name: neutron - repo: https://git.openstack.org/openstack/neutron + repo: https://opendev.org/openstack/neutron branch: master - name: neutron-plugins - repo: https://git.openstack.org/openstack/neutron-tempest-plugin + repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master tempest_test_whitelist: diff --git a/tests/neutron-overrides-ovn.yml b/tests/neutron-overrides-ovn.yml index 90b0f5a4..2f1de7a7 100644 --- a/tests/neutron-overrides-ovn.yml +++ b/tests/neutron-overrides-ovn.yml @@ -7,10 +7,10 @@ tempest_run: yes tempest_plugins: - name: neutron - repo: https://git.openstack.org/openstack/neutron + repo: https://opendev.org/openstack/neutron branch: master - name: neutron-plugins - repo: https://git.openstack.org/openstack/neutron-tempest-plugin + repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master tempest_test_whitelist: diff --git a/tests/neutron-overrides-ovs-fwaasv2.yml b/tests/neutron-overrides-ovs-fwaasv2.yml index e0cd1f62..d2627ec7 100644 --- a/tests/neutron-overrides-ovs-fwaasv2.yml +++ b/tests/neutron-overrides-ovs-fwaasv2.yml @@ -7,13 +7,13 @@ tempest_run: yes tempest_plugins: - name: neutron - repo: https://git.openstack.org/openstack/neutron + repo: https://opendev.org/openstack/neutron branch: master - name: neutron-plugins - repo: https://git.openstack.org/openstack/neutron-tempest-plugin + repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master - name: neutron-fwaas - repo: https://git.openstack.org/openstack/neutron-fwaas + repo: https://opendev.org/openstack/neutron-fwaas branch: master tempest_test_whitelist: diff --git a/tests/neutron-overrides-ovs-nsh.yml b/tests/neutron-overrides-ovs-nsh.yml index 22957d14..fbd3d4a6 100644 --- a/tests/neutron-overrides-ovs-nsh.yml +++ b/tests/neutron-overrides-ovs-nsh.yml @@ -29,10 +29,10 @@ tempest_run: yes tempest_plugins: - name: neutron - repo: https://git.openstack.org/openstack/neutron + repo: https://opendev.org/openstack/neutron branch: master - name: neutron-plugins - repo: https://git.openstack.org/openstack/neutron-tempest-plugin + repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master tempest_test_whitelist: diff --git a/tests/neutron-overrides-ovs-sfc.yml b/tests/neutron-overrides-ovs-sfc.yml index c2c1aeea..2415d60f 100644 --- a/tests/neutron-overrides-ovs-sfc.yml +++ b/tests/neutron-overrides-ovs-sfc.yml @@ -31,10 +31,10 @@ tempest_run: yes tempest_plugins: - name: neutron - repo: https://git.openstack.org/openstack/neutron + repo: https://opendev.org/openstack/neutron branch: master - name: neutron-plugins - repo: https://git.openstack.org/openstack/neutron-tempest-plugin + repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master tempest_test_whitelist: diff --git a/tests/neutron-overrides-ovs.yml b/tests/neutron-overrides-ovs.yml index 86e7f883..ddf973e1 100644 --- a/tests/neutron-overrides-ovs.yml +++ b/tests/neutron-overrides-ovs.yml @@ -8,10 +8,10 @@ tempest_run: yes tempest_plugins: - name: neutron - repo: https://git.openstack.org/openstack/neutron + repo: https://opendev.org/openstack/neutron branch: master - name: neutron-plugins - repo: https://git.openstack.org/openstack/neutron-tempest-plugin + repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master tempest_test_whitelist: diff --git a/tests/os_neutron-overrides.yml b/tests/os_neutron-overrides.yml index d1d12f7b..d342b150 100644 --- a/tests/os_neutron-overrides.yml +++ b/tests/os_neutron-overrides.yml @@ -17,10 +17,10 @@ tempest_run: yes tempest_plugins: - name: neutron - repo: https://git.openstack.org/openstack/neutron + repo: https://opendev.org/openstack/neutron branch: master - name: neutron-plugins - repo: https://git.openstack.org/openstack/neutron-tempest-plugin + repo: https://opendev.org/openstack/neutron-tempest-plugin branch: master tempest_test_whitelist: