Allow git servers for openstack services and tempest to be overridden

This will allow the services to be cloned from github or a local
mirror by setting a small number of variables rather than overriding
every git repo URL individually.

Change-Id: I750d897e9e3c8ca161c0740c73cdc4c6e42b6440

inventory/group_vars/all/all.yml

@@ -22,6 +22,12 @@ openstack_config_dir: "{{ lookup('env', 'OSA_CONFIG_DIR') | default('/etc/openst
 ## OpenStack Clone directory
 openstack_clone_root: "{{ (lookup('env', 'OSA_CLONE_ROOT') | default('/opt/openstack-ansible', true)) }}"
 
+## OpenDev base URL
+openstack_opendev_base_url: https://opendev.org
+
+## Github base URL
+openstack_github_base_url: https://github.com
+
 ## OpenStack service python version
 openstack_venv_python_executable: "python3"
 

playbooks/defaults/repo_packages/gnocchi.yml

@@ -34,6 +34,6 @@
 ## Gnocchi service
 ## This service has a different stable branch strategy to the rest of OpenStack.
 ## The SHA is recorded here to make the SHA updating easier.
-gnocchi_git_repo: https://github.com/gnocchixyz/gnocchi
+gnocchi_git_repo: "{{ openstack_github_base_url }}/gnocchixyz/gnocchi"
 gnocchi_git_install_branch: a65065e05138c88b7c8e6f5f1a124f108af70d8d
 gnocchi_git_track_branch: stable/4.4

playbooks/defaults/repo_packages/nova_consoles.yml

@@ -27,12 +27,12 @@
 ### HEAD as of 16.12.2022 ###
 
 ## NOVNC from source
-novncproxy_git_repo: https://github.com/novnc/noVNC
+novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC"
 novncproxy_git_install_branch: 4fb2d6c497dc2e307400ff581f9292758c709b40
 novncproxy_git_track_branch: master
 
 
 ## spice-html5 from source
-spicehtml5_git_repo: https://github.com/freedesktop/spice-html5
+spicehtml5_git_repo: "{{ openstack_github_base_url }}/freedesktop/spice-html5"
 spicehtml5_git_install_branch: 56ddb3005e39a9e76670fec9676e667d44167bf3
 spicehtml5_git_track_branch: master

playbooks/defaults/repo_packages/openstack_services.yml

@@ -16,7 +16,7 @@
 
 ## NOTICE on items in this file:
 ##   * If you use anything in the *._git_install_branch field that is not a TAG
-##     make sure to leave an in-line comment as to "why".
+##     or SHA make sure to leave an in-line comment as to "why".
 
 ## For the sake of anyone else editing this file:
 ##   * If you add services to this file please do so in alphabetical order.
@@ -24,6 +24,9 @@
 ##   * All items with this file should be separated by `name_` note that the name of the
 ##     package should be one long name with no additional `_` separating it.
 
+### Default values for variables in this file are:
+## openstack_opendev_base_url: https://opendev.org
+## openstack_github_base_url: https://github.com
 
 ### Before this is shipped all of these services should have a tag set as the branch,
 ### or have a comment / reason attached to them as to why a tag can not work.
@@ -31,280 +34,281 @@
 ### HEAD as of 16.12.2022 ###
 
 ## Global Requirements
-requirements_git_repo: https://opendev.org/openstack/requirements
+requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements"
 requirements_git_install_branch: 98d8436315b35b092d5d5a25d3ac1cea3d631475
 requirements_git_track_branch: master
 
 ## Adjutant service
-adjutant_git_repo: https://opendev.org/openstack/adjutant
+adjutant_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant"
 adjutant_git_install_branch: a84d0da6329cddf57b699f05bc43e09aa1a15f2d
 adjutant_git_track_branch: master
 
 ## Adjutant dashboard plugin
-adjutant_dashboard_git_repo: https://opendev.org/openstack/adjutant-ui
+adjutant_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant-ui"
 adjutant_dashboard_git_install_branch: 104c474479e9a89d22b96777378ff59983c03393
 adjutant_dashboard_git_track_branch: master
 
 ## Aodh service
-aodh_git_repo: https://opendev.org/openstack/aodh
+aodh_git_repo: "{{ openstack_opendev_base_url }}/openstack/aodh"
 aodh_git_install_branch: 3a6480434e8ee4b6fa0af3fcf60c4b34ef7b09b1
 aodh_git_track_branch: master
 
 ## Barbican service
-barbican_git_repo: https://opendev.org/openstack/barbican
+barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/barbican"
 barbican_git_install_branch: aba0bd074ed9098ed2518dca28487a98f5e3711a
 barbican_git_track_branch: master
 
 ## Barbican dashboard plugin
-barbican_dashboard_git_repo: https://opendev.org/openstack/barbican-ui
+barbican_dashboard_git_repo: "{{ openstack_opendev_base_url }}//openstack/barbican-ui"
 barbican_dashboard_git_install_branch: 3a78a743426376250f43508d4281e86c75067271
 barbican_dashboard_git_track_branch: master
 
 ## Ceilometer service
-ceilometer_git_repo: https://opendev.org/openstack/ceilometer
+ceilometer_git_repo: "{{ openstack_opendev_base_url }}/openstack/ceilometer"
 ceilometer_git_install_branch: 8810c4bc9aa46314752ca92abcbb36d8a81d74d6
 ceilometer_git_track_branch: master
 
 ## Cinder service
-cinder_git_repo: https://opendev.org/openstack/cinder
+cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder"
 cinder_git_install_branch: 24a783408879abd479e77dd88b43bf2a1be048fe
 cinder_git_track_branch: master
 
 ## Cloudkitty service
-cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty
+cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty"
 cloudkitty_git_install_branch: 3a90e20130917d3af0171e35cc9f7154c5b1706e
 cloudkitty_git_track_branch: master
 
 ## Cloudkitty dashboard plugin
-cloudkitty_dashboard_git_repo: https://opendev.org/openstack/cloudkitty-dashboard
+cloudkitty_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty-dashboard"
 cloudkitty_dashboard_git_install_branch: 7cdee86bac20a38d191677eaefe94914cc5207f7
 cloudkitty_dashboard_git_track_branch: master
 
 ## Designate service
-designate_git_repo: https://opendev.org/openstack/designate
+designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate"
 designate_git_install_branch: e6bf93a80af9d167c286382fa34a68706a5b2376
 designate_git_track_branch: master
 
 ## Horizon Designate dashboard plugin
-designate_dashboard_git_repo: https://opendev.org/openstack/designate-dashboard
+designate_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate-dashboard"
 designate_dashboard_git_install_branch: eea24178501ea06ae6b5042bbbedb8e0011bc674
 designate_dashboard_git_track_branch: master
 
 ## Glance service
-glance_git_repo: https://opendev.org/openstack/glance
+glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance"
 glance_git_install_branch: bc9856ea9ce2ced219e9b294d8db3b5645d69796
 glance_git_track_branch: master
 
 ## Heat service
-heat_git_repo: https://opendev.org/openstack/heat
+heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat"
 heat_git_install_branch: b5caa1847cd6b96ea8f68dd52e67e00ba6602aca
 heat_git_track_branch: master
 
 ## Horizon Heat dashboard plugin
-heat_dashboard_git_repo: https://opendev.org/openstack/heat-dashboard
+heat_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat-dashboard"
 heat_dashboard_git_install_branch: 903d7a925aa0db3a0924e8ee6316723b2e0c687c
 heat_dashboard_git_track_branch: master
 
 ## Horizon service
-horizon_git_repo: https://opendev.org/openstack/horizon
+horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon"
 horizon_git_install_branch: 0add65eddcd6e70d4fbe76951d76c66ecc1a34b3
 horizon_git_track_branch: master
 
 ## Horizon Ironic dashboard plugin
-ironic_dashboard_git_repo: https://opendev.org/openstack/ironic-ui
+ironic_dashboard_git_repo: "{{ openstack_opendev_base_url}}/openstack/ironic-ui"
 ironic_dashboard_git_install_branch: 647f4988390e425f3803a200d2ad8877b56bc8c1
 ironic_dashboard_git_track_branch: master
 
 ## Horizon Magnum dashboard plugin
-magnum_dashboard_git_repo: https://opendev.org/openstack/magnum-ui
+magnum_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum-ui"
 magnum_dashboard_git_install_branch: 92518c90b0fd5012288ff3c454b5d86c4188a5a2
 magnum_dashboard_git_track_branch: master
 
 ## Horizon Masakari dashboard plugin
-masakari_dashboard_git_repo: https://opendev.org/openstack/masakari-dashboard
+masakari_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-dashboard"
 masakari_dashboard_git_install_branch: c5c78cbe36a574eceabbd8d4a915a495e16eec38
 masakari_dashboard_git_track_branch: master
 
 ## Horizon Sahara dashboard plugin
-sahara_dashboard_git_repo: https://opendev.org/openstack/sahara-dashboard
+sahara_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara-dashboard"
 sahara_dashboard_git_install_branch: bdc39bbb0456d672cdfc16a7d1ace1c0f722490c
 sahara_dashboard_git_track_branch: master
 
 ## Keystone service
-keystone_git_repo: https://opendev.org/openstack/keystone
+keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone"
 keystone_git_install_branch: 7d4047cb69139c22f4e321e9ba8b287a47168df2
 keystone_git_track_branch: master
 
 ## Manila service
-manila_git_repo: https://opendev.org/openstack/manila
+manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila"
 manila_git_install_branch: 4408ec4f7cfac834c454537388fa23a13915e3f9
 manila_git_track_branch: master
 
 ## Neutron service
-neutron_git_repo: https://opendev.org/openstack/neutron
+neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron"
 neutron_git_install_branch: 7c449f1833a94a544cf0b9cfcf63f3e7e46fae26
 neutron_git_track_branch: master
 
-neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas
+neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas"
 neutron_vpnaas_git_install_branch: d1b1f94b1b7aaa559b43e222974e0e92d811aff7
 neutron_vpnaas_git_track_branch: master
 
-neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing
+
+neutron_dynamic_routing_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-dynamic-routing"
 neutron_dynamic_routing_git_install_branch: 8bee5cc07ef9b8eda02e4aec2dcca9bd5e8f5af5
 neutron_dynamic_routing_git_track_branch: master
 
 # Networking calico follows master
-networking_calico_git_repo: https://github.com/projectcalico/networking-calico
+networking_calico_git_repo: "{{ openstack_github_base_url }}/projectcalico/networking-calico"
 networking_calico_git_install_branch: 69ada593823daaecb997114e694522449839f131
 networking_calico_git_track_branch: release-v3.21
 
-networking_odl_git_repo: https://opendev.org/openstack/networking-odl
+networking_odl_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-odl"
 networking_odl_git_install_branch: eecb7125a630c5790852739b8bad0306f1b3aa59
 networking_odl_git_track_branch: master
 
-networking_bgpvpn_git_repo: https://opendev.org/openstack/networking-bgpvpn
+networking_bgpvpn_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-bgpvpn"
 networking_bgpvpn_git_install_branch: 3a668d598a008881154b77bf87c4baee08d199ef
 networking_bgpvpn_git_track_branch: master
 
-networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc
+networking_sfc_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-sfc"
 networking_sfc_git_install_branch: f3de0806c8bac71605edab30fffefee0380edf1f
 networking_sfc_git_track_branch: master
 
-networking_generic_switch_git_repo: https://opendev.org/openstack/networking-generic-switch
+networking_generic_switch_git_repo: "{{ openstack_opendev_base_url}}/openstack/networking-generic-switch"
 networking_generic_switch_git_install_branch: 28bca5377d4fa14cb2be071852b76e457b435d7d
 networking_generic_switch_git_track_branch: master
 
-networking_nsx_git_repo: https://opendev.org/x/vmware-nsx
+networking_nsx_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsx"
 networking_nsx_git_install_branch: 0253265f75f63d5619b30f16a6b64459dec79d82
 networking_nsx_git_track_branch: master
 
-networking_nsxlib_git_repo: https://opendev.org/x/vmware-nsxlib
+networking_nsxlib_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsxlib"
 networking_nsxlib_git_install_branch: 7b16449dabedb8524a61a372976e6792811fd026
 networking_nsxlib_git_track_branch: master
 
-networking_baremetal_git_repo: https://opendev.org/openstack/networking-baremetal
+networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal"
 networking_baremetal_git_install_branch: 0314baf5c601e2e572c169dddc1eed565bb94c76
 networking_baremetal_git_track_branch: master
 
 ## Nova service
-nova_git_repo: https://opendev.org/openstack/nova
+nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova"
 nova_git_install_branch: 8a476061c5e034016668cd9e5a20c4430ef6b68d
 nova_git_track_branch: master
 
 ## Sahara service
-sahara_git_repo: https://opendev.org/openstack/sahara
+sahara_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara"
 sahara_git_install_branch: ebc6d74bf822fabae2ba8feab2ca561f83b239c0
 sahara_git_track_branch: master
 
 ## Senlin service
-senlin_git_repo: https://opendev.org/openstack/senlin
+senlin_git_repo: "{{ openstack_opendev_base_url }}/openstack/senlin"
 senlin_git_install_branch: 0743b6ec7b31831430422bc5513e05820a326a0c
 senlin_git_track_branch: master
 
 ## Swift service
-swift_git_repo: https://opendev.org/openstack/swift
+swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift"
 swift_git_install_branch: 9dc12a89029526f0ac8cd4aa30e121e4fdac1641
 swift_git_track_branch: master
 
 ## Ironic service
-ironic_git_repo: https://opendev.org/openstack/ironic
+ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic"
 ironic_git_install_branch: ef772c2c1e84769a982c54ec8832e2a06b8f1911
 ironic_git_track_branch: master
 
 ## Ironic inspector service
-ironic_inspector_git_repo: https://opendev.org/openstack/ironic-inspector
+ironic_inspector_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic-inspector"
 ironic_inspector_git_install_branch: 664aa3fb4ce778a142a0497a7035ce5499c6be03
 ironic_inspector_git_track_branch: master
 
 ## Magnum service
-magnum_git_repo: https://opendev.org/openstack/magnum
+magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum"
 magnum_git_install_branch: e8522168da1e908c1a695ecd0f7d6ab9a880f5d8
 magnum_git_track_branch: master
 
 ## Masakari service
-masakari_git_repo: https://opendev.org/openstack/masakari
+masakari_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari"
 masakari_git_install_branch: 7ec3edda1ada9c2464d79c84b0fd1d1be22f9336
 masakari_git_track_branch: master
 
 ## Masakari monitors services
-masakari_monitors_git_repo: https://opendev.org/openstack/masakari-monitors
+masakari_monitors_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-monitors"
 masakari_monitors_git_install_branch: 146652e6bb0539c38f7cac383d4c55a942df1cae
 masakari_monitors_git_track_branch: master
 
 ## Mistral service
-mistral_git_repo: https://opendev.org/openstack/mistral
+mistral_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral"
 mistral_git_install_branch: d035624153011673e8d542a7c88a8f717f46475a
 mistral_git_track_branch: master
 
-mistral_extra_git_repo: https://opendev.org/openstack/mistral-extra
+mistral_extra_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral-extra"
 mistral_extra_git_install_branch: 35b2e5e87876ecabc8166a9442831fc32f9fbd98
 mistral_extra_git_track_branch: master
 
 ## Murano service
-murano_git_repo: https://opendev.org/openstack/murano
+murano_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano"
 murano_git_install_branch: ada28b3ac6e6c19688dc6fd6a19630d1cf5e0530
 murano_git_track_branch: master
 
-murano_dashboard_git_repo: https://opendev.org/openstack/murano-dashboard
+murano_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano-dashboard"
 murano_dashboard_git_install_branch: d85b61155590d61edbdc326dcd0e070c15f86fcb
 murano_dashboard_git_track_branch: master
 
 ## Trove service
-trove_git_repo: https://opendev.org/openstack/trove
+trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove"
 trove_git_install_branch: 1d8231d31ffde24387fcb63faa55689bbb81ad36
 trove_git_track_branch: master
 
 ## Horizon Trove dashboard plugin
-trove_dashboard_git_repo: https://opendev.org/openstack/trove-dashboard
+trove_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove-dashboard"
 trove_dashboard_git_install_branch: 4c67c6db21e7537cffc29638f011bde14535000a
 trove_dashboard_git_track_branch: master
 
 ## Octavia service
-octavia_git_repo: https://opendev.org/openstack/octavia
+octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia"
 octavia_git_install_branch: 8d27bdb5462474dafc934d164f3a299bfca8dd89
 octavia_git_track_branch: master
 
 ## Octavia OVN provider
-octavia_ovn_octavia_provider_git_repo: https://opendev.org/openstack/ovn-octavia-provider
+octavia_ovn_octavia_provider_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-octavia-provider"
 octavia_ovn_octavia_provider_git_install_branch: ef019ed63b7be9b2ff2eff5a1530d0870529da72
 octavia_ovn_octavia_provider_git_track_branch: master
 
 ## Placement service
-placement_git_repo: https://opendev.org/openstack/placement
+placement_git_repo: "{{ openstack_opendev_base_url }}/openstack/placement"
 placement_git_install_branch: bacd2c039345dd12f22b0474b8a0f6a691a8ed98
 placement_git_track_branch: master
 
 ## Tacker service
-tacker_git_repo: https://opendev.org/openstack/tacker
+tacker_git_repo: "{{ openstack_opendev_base_url }}/openstack/tacker"
 tacker_git_install_branch: 990e6a73f34bc98cdd03a54f6f726467af3bd8da
 tacker_git_track_branch: master
 
 ## Horizon Octavia dashboard plugin
-octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard
+octavia_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia-dashboard"
 octavia_dashboard_git_install_branch: 774972c44741ec78b36fa45fbf8c356850f55541
 octavia_dashboard_git_track_branch: master
 
 ## Blazar service
-blazar_git_repo: https://opendev.org/openstack/blazar
+blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar"
 blazar_git_install_branch: 68c6487465d15bf9db4559e36eaf2b50ab2a0a9c
 blazar_git_track_branch: master
 
 ## Blazar Nova Service
-blazar_nova_git_repo: https://opendev.org/openstack/blazar-nova
+blazar_nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar-nova"
 blazar_nova_git_install_branch: 7246c6b03e6b536ea5d1ec4d21ff9ab049bc0bc4
 blazar_nova_git_track_branch: master
 
 ## Zun service
-zun_git_repo: https://opendev.org/openstack/zun
+zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun"
 zun_git_install_branch: 8244086d1fec030b10dbf2e066859ce03761f0fd
 zun_git_track_branch: master
 
 ## Zun kuryr service
-zun_kuryr_git_repo: https://opendev.org/openstack/kuryr-libnetwork
+zun_kuryr_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr-libnetwork"
 zun_kuryr_git_install_branch: b33439ba71b73e7f34474eecad9756d689c173db
 zun_kuryr_git_track_branch: master
 
 ## Zun kuryr library
-zun_kuryr_lib_git_repo: https://opendev.org/openstack/kuryr
+zun_kuryr_lib_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr"
 zun_kuryr_lib_git_install_branch: 79619532fc5f074fb1c65c0733724d139468c0c7
 zun_kuryr_lib_git_track_branch: master

playbooks/defaults/repo_packages/openstack_testing.yml

@@ -15,90 +15,90 @@
 
 ### HEAD as of 16.12.2022 ###
 
-tempest_git_repo: https://opendev.org/openstack/tempest
+tempest_git_repo: "{{ openstack_opendev_base_url }}/openstack/tempest"
 tempest_git_install_branch: 54fd0732ec54907ce6cf45a36e9d15386d33fc2b
 tempest_git_track_branch: master
 
-tempest_plugin_barbican_git_repo: https://opendev.org/openstack/barbican-tempest-plugin
+tempest_plugin_barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/barbican-tempest-plugin"
 tempest_plugin_barbican_git_install_branch: 30e50ef9c85bf008c7c3e5aeb6b009629a2013c9
 tempest_plugin_barbican_git_track_branch: master
 
-tempest_plugin_cinder_git_repo: https://opendev.org/openstack/cinder-tempest-plugin
+tempest_plugin_cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder-tempest-plugin"
 tempest_plugin_cinder_git_install_branch: 0e9461155e2acf2d68f2b42c8a5942af8975190a
 tempest_plugin_cinder_git_track_branch: master
 
-tempest_plugin_cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty-tempest-plugin
+tempest_plugin_cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty-tempest-plugin"
 tempest_plugin_cloudkitty_git_install_branch: 8a1999ca0d1976fcf77c729b0746926149650bb9
 tempest_plugin_cloudkitty_git_track_branch: master
 
-tempest_plugin_designate_git_repo: https://opendev.org/openstack/designate-tempest-plugin
+tempest_plugin_designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate-tempest-plugin"
 tempest_plugin_designate_git_install_branch: ff6c24db8461975b9409505f0dca89909ea410c9
 tempest_plugin_designate_git_track_branch: master
 
-tempest_plugin_glance_git_repo: https://opendev.org/openstack/glance-tempest-plugin
+tempest_plugin_glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance-tempest-plugin"
 tempest_plugin_glance_git_install_branch: 4a614cade2061dedd1c0704428f3b04c05d87ca3
 tempest_plugin_glance_git_track_branch: master
 
-tempest_plugin_heat_git_repo: https://opendev.org/openstack/heat-tempest-plugin
+tempest_plugin_heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat-tempest-plugin"
 tempest_plugin_heat_git_install_branch: 4196ac5992b5e63ac97dd0f990278c37b17d6c6e
 tempest_plugin_heat_git_track_branch: master
 
-tempest_plugin_ironic_git_repo: https://opendev.org/openstack/ironic-tempest-plugin
+tempest_plugin_ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic-tempest-plugin"
 tempest_plugin_ironic_git_install_branch: 4684f915b58d2c161295100802dec7076920451f
 tempest_plugin_ironic_git_track_branch: master
 
-tempest_plugin_keystone_git_repo: https://opendev.org/openstack/keystone-tempest-plugin
+tempest_plugin_keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone-tempest-plugin"
 tempest_plugin_keystone_git_install_branch: 7f43a203803248854f8213c91ae61c04d33d57f3
 tempest_plugin_keystone_git_track_branch: master
 
-tempest_plugin_magnum_git_repo: https://opendev.org/openstack/magnum-tempest-plugin
+tempest_plugin_magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum-tempest-plugin"
 tempest_plugin_magnum_git_install_branch: 246c3f5544a00ef8e858d977eea7509539978190
 tempest_plugin_magnum_git_track_branch: master
 
-tempest_plugin_manila_git_repo: https://opendev.org/openstack/manila-tempest-plugin
+tempest_plugin_manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila-tempest-plugin"
 tempest_plugin_manila_git_install_branch: 908d6c9ef7a3b5862d36470540cb6d80826f07fa
 tempest_plugin_manila_git_track_branch: master
 
-tempest_plugin_murano_git_repo: https://opendev.org/openstack/murano-tempest-plugin
+tempest_plugin_murano_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano-tempest-plugin"
 tempest_plugin_murano_git_install_branch: e16b2dc1512854c9a249944a5f288a1065f328fd
 tempest_plugin_murano_git_track_branch: master
 
-tempest_plugin_neutron_git_repo: https://opendev.org/openstack/neutron-tempest-plugin
+tempest_plugin_neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-tempest-plugin"
 tempest_plugin_neutron_git_install_branch: 9c5396ab70dd2cd5cc0d555f7a7c76b98594129c
 tempest_plugin_neutron_git_track_branch: master
 
-tempest_plugin_novajoin_git_repo: https://opendev.org/x/novajoin-tempest-plugin
+tempest_plugin_novajoin_git_repo: "{{ openstack_opendev_base_url }}/x/novajoin-tempest-plugin"
 tempest_plugin_novajoin_git_install_branch: 0df7e1c6b58ba108fcd38a0b5ea4e4f45e87a05d
 tempest_plugin_novajoin_git_track_branch: master
 
-tempest_plugin_octavia_git_repo: https://opendev.org/openstack/octavia-tempest-plugin
+tempest_plugin_octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia-tempest-plugin"
 tempest_plugin_octavia_git_install_branch: dddf6515ab4cec0d02255f17bb6a41660eca6289
 tempest_plugin_octavia_git_track_branch: master
 
-tempest_plugin_senlin_git_repo: https://opendev.org/openstack/senlin-tempest-plugin
+tempest_plugin_senlin_git_repo: "{{ openstack_opendev_base_url }}/openstack/senlin-tempest-plugin"
 tempest_plugin_senlin_git_install_branch: b6189a4e0f66070f36ca9ce6c5376cd5e605e401
 tempest_plugin_senlin_git_track_branch: master
 
-tempest_plugin_sahara_git_repo: https://opendev.org/openstack/sahara-tests
+tempest_plugin_sahara_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara-tests"
 tempest_plugin_sahara_git_install_branch: 98063d3fd93ce77cb3ecbbd33868bbe5dd3a6865
 tempest_plugin_sahara_git_track_branch: master
 
-tempest_plugin_telemetry_git_repo: https://opendev.org/openstack/telemetry-tempest-plugin
+tempest_plugin_telemetry_git_repo: "{{ openstack_opendev_base_url }}/openstack/telemetry-tempest-plugin"
 tempest_plugin_telemetry_git_install_branch: 885adad3ffc6d195ae41c438ef30835a76c6cee0
 tempest_plugin_telemetry_git_track_branch: master
 
-tempest_plugin_trove_git_repo: https://opendev.org/openstack/trove-tempest-plugin
+tempest_plugin_trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove-tempest-plugin"
 tempest_plugin_trove_git_install_branch: fe377e07847a515e34274b9173e37fde71a38c4d
 tempest_plugin_trove_git_track_branch: master
 
-tempest_plugin_zaqar_git_repo: https://opendev.org/openstack/zaqar-tempest-plugin
+tempest_plugin_zaqar_git_repo: "{{ openstack_opendev_base_url }}/openstack/zaqar-tempest-plugin"
 tempest_plugin_zaqar_git_install_branch: 3813c99e501a1f67a9cbde751cf71747a61f6786
 tempest_plugin_zaqar_git_track_branch: master
 
-tempest_plugin_zun_git_repo: https://opendev.org/openstack/zun-tempest-plugin
+tempest_plugin_zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun-tempest-plugin"
 tempest_plugin_zun_git_install_branch: 6a7c3f7c4c3fd8ca4d4f2e57b1cc7b791e9cf2d4
 tempest_plugin_zun_git_track_branch: master
 
-rally_openstack_git_repo: https://opendev.org/openstack/rally-openstack
+rally_openstack_git_repo: "{{ openstack_opendev_base_url }}/openstack/rally-openstack"
 rally_openstack_git_install_branch: b8591ec366293d60735536f95f0d09a8c18916ca
 rally_openstack_git_track_branch: master

releasenotes/notes/service_repo_base_urls-8f85bcee712e5d77.yaml

@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    New variables ``openstack_opendev_base_url`` and
+    ``openstack_github_base_url`` have been implemented that allow to quickly
+    change base url of repositories for all used service. This might be
+    useful for environments with limited connectivity or in case of issues
+    with one of the mirrors.

scripts/get-ansible-role-requirements.yml

@@ -92,24 +92,16 @@
                                                    | select('match', 'opendev.org')
                                                    | list }}"
 
-        # Use the cached repos in the CI images rather than clone from opendev.org
-        - name: Generate list of openstack service repositories
-          set_fact:
-            service_git_repos: "{{ lookup('file', openstack_services_file).splitlines() |
-                                   select('contains', 'git_repo') |
-                                   select('contains', 'opendev.org') | list |
-                                   replace('https://', 'file:///openstack/src/') }}"
-
         - name: Ensure overrides directory exists
           file:
             path: "{{ config_dir }}"
             state: directory
 
-        - name: Create overrides for openstack_services git repos to use local cache
+        - name: Create override for zuul git server to local repos
-          blockinfile:
+          copy:
-            path: "{{ config_dir }}/user_variables_zuulrepos.yml"
+            content: |
-            block: "{{ service_git_repos | join('\n') }}"
+              openstack_opendev_base_url: "file:///openstack/src/opendev.org"
-            create: yes
+            dest: "{{ config_dir }}/user_variables_zuulrepos.yml"
 
       when:
         - "lookup('env', 'ZUUL_SRC_PATH') != ''"
@@ -166,7 +158,6 @@
     ansible_python_interpreter: "/opt/ansible-runtime/bin/python"
     config_dir: "{{ lookup('env', 'OSA_CONFIG_DIR') | default('/etc/openstack_deploy', true) }}"
     required_roles: "{{ lookup('file', role_file) | from_yaml }}"
-    openstack_services_file: "{{ playbook_dir }}/../playbooks/defaults/repo_packages/openstack_services.yml"
     role_file: "{{ playbook_dir }}/../ansible-role-requirements.yml"
     role_path_default: '/etc/ansible/roles'
     user_roles: "{{ lookup('file', user_role_path, errors='ignore')|default([], true) | from_yaml }}"