From b97c4860eb7a3f3340a411e4d2d1d914cf8171aa Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 31 May 2023 20:33:16 +0200 Subject: [PATCH] Start 2023.2 (Bobcat) development Depends-On: https://review.opendev.org/c/openstack/tempest/+/884584 Change-Id: I124942ace678765b01bcb642798bdca6d14f3141 --- ansible-role-requirements.yml | 200 +++++++++--------- deploy-guide/source/conf.py | 4 +- doc/source/admin/upgrades/major-upgrades.rst | 17 +- doc/source/conf.py | 6 +- doc/source/index.rst | 19 +- .../group_vars/adjutant_all/source_git.yml | 2 +- inventory/group_vars/all/source_git.yml | 6 +- inventory/group_vars/aodh_all/source_git.yml | 6 +- .../group_vars/barbican_all/source_git.yml | 6 +- .../group_vars/blazar_all/source_git.yml | 10 +- .../group_vars/ceilometer_all/source_git.yml | 6 +- .../group_vars/cinder_all/source_git.yml | 6 +- .../group_vars/cloudkitty_all/source_git.yml | 6 +- .../group_vars/designate_all/source_git.yml | 6 +- .../group_vars/glance_all/source_git.yml | 6 +- inventory/group_vars/heat_all/source_git.yml | 6 +- .../group_vars/horizon_all/source_git.yml | 48 ++--- .../group_vars/ironic_all/source_git.yml | 10 +- .../group_vars/keystone_all/source_git.yml | 6 +- .../group_vars/magnum_all/source_git.yml | 6 +- .../group_vars/manila_all/source_git.yml | 6 +- .../group_vars/masakari_all/source_git.yml | 10 +- .../group_vars/mistral_all/source_git.yml | 10 +- .../group_vars/murano_all/source_git.yml | 6 +- .../group_vars/neutron_all/source_git.yml | 34 +-- inventory/group_vars/nova_all/source_git.yml | 6 +- .../group_vars/octavia_all/source_git.yml | 10 +- .../group_vars/placement_all/source_git.yml | 6 +- .../group_vars/sahara_all/source_git.yml | 6 +- .../group_vars/senlin_all/source_git.yml | 6 +- inventory/group_vars/swift_all/source_git.yml | 4 +- .../group_vars/tacker_all/source_git.yml | 6 +- inventory/group_vars/trove_all/source_git.yml | 6 +- .../group_vars/utility_all/source_git.yml | 72 +++---- inventory/group_vars/zun_all/source_git.yml | 14 +- scripts/gate-check-commit.sh | 2 +- scripts/run-upgrade.sh | 8 +- .../define-neutron-plugin.yml | 48 ----- zuul.d/jobs.yaml | 18 -- zuul.d/project-templates.yaml | 3 - 40 files changed, 294 insertions(+), 369 deletions(-) delete mode 100644 scripts/upgrade-utilities/define-neutron-plugin.yml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 8f796541d6..4cb991d573 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -2,32 +2,32 @@ - name: ansible-hardening scm: git src: https://opendev.org/openstack/ansible-hardening - version: 42b68b9ff7070f14f896ece1f242a522d1ba9559 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: apt_package_pinning scm: git src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning - version: 56ef6c79a4525743d9efade90a8909dc915857a1 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: galera_server scm: git src: https://opendev.org/openstack/openstack-ansible-galera_server - version: b36429d903b630864067f3dafeacc49774a6b3ec - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: ceph_client scm: git src: https://opendev.org/openstack/openstack-ansible-ceph_client - version: fc1cce881722dad32b6eed452ca22e5a4aa273eb - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: haproxy_server scm: git src: https://opendev.org/openstack/openstack-ansible-haproxy_server - version: 418750857a81902f970897c0ccf3b41b9c1920b5 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-28' - name: keepalived scm: git @@ -38,218 +38,218 @@ - name: lxc_container_create scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_container_create - version: 9e9b6414dcaebbd31fdf4b5aa4fbdf054f9ee1cd - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: lxc_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_hosts - version: e48d146b2b1571adfce599257643da0966edeed3 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: memcached_server scm: git src: https://opendev.org/openstack/openstack-ansible-memcached_server - version: 1414154691fc370cb76b9811477b7f355a85d9d8 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: openstack_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_hosts - version: d9434cc6ce0aafc96c0c9139c4772eb2e1691417 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_keystone scm: git src: https://opendev.org/openstack/openstack-ansible-os_keystone - version: 63de04747c3b2414d6b301c88588246b671e8b39 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: openstack_openrc scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_openrc - version: e8426844dfa6ad1e378bc7033dd010d3ad051cc6 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_adjutant scm: git src: https://opendev.org/openstack/openstack-ansible-os_adjutant - version: 4ce47a5d3efeb3d603abbcfaeb241359ed794807 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_aodh scm: git src: https://opendev.org/openstack/openstack-ansible-os_aodh - version: aa226932142986b578aaca197684eb82c772dab0 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_barbican scm: git src: https://opendev.org/openstack/openstack-ansible-os_barbican - version: c503837c45ce2819542c31f7e311c67c77554cb6 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_blazar scm: git src: https://opendev.org/openstack/openstack-ansible-os_blazar - version: f9a2266a6306cfedda85fc6c6871c1ff66aee4f2 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_ceilometer scm: git src: https://opendev.org/openstack/openstack-ansible-os_ceilometer - version: bed01a0a5e73cc1926c06388c99a9fd66b7240d9 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_cinder scm: git src: https://opendev.org/openstack/openstack-ansible-os_cinder - version: 251778639170c8b7fef733a6ee3021c7bf6bdc85 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_cloudkitty scm: git src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty - version: 8dbd795dc88439d196490f6d4d599bfaa4a5cbfb - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_designate scm: git src: https://opendev.org/openstack/openstack-ansible-os_designate - version: 69279e2cfbc041dce594d525959de88517bceecc - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_glance scm: git src: https://opendev.org/openstack/openstack-ansible-os_glance - version: a16f6f5b57b346d52fde9bce51f22e7b83525cd8 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_gnocchi scm: git src: https://opendev.org/openstack/openstack-ansible-os_gnocchi - version: b4dff63158994334b541752ea9cd01836c39dca6 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_heat scm: git src: https://opendev.org/openstack/openstack-ansible-os_heat - version: 00a6843dd8ee1eb6d43fca20c997708a866104c4 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_horizon scm: git src: https://opendev.org/openstack/openstack-ansible-os_horizon - version: fa12f483afcdcea94a033f0ce06d7213c20e1334 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_ironic scm: git src: https://opendev.org/openstack/openstack-ansible-os_ironic - version: e1a0f2bf963c519378e5e0f6d2151c5b01da8398 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_magnum scm: git src: https://opendev.org/openstack/openstack-ansible-os_magnum - version: 90d678cf0a8f9076c5b15514756967e0c56ef5cb - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_manila scm: git src: https://opendev.org/openstack/openstack-ansible-os_manila - version: 2a21c4b25b16829b663c4c631e6d9061a92ede65 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_masakari scm: git src: https://opendev.org/openstack/openstack-ansible-os_masakari - version: 7bf8bdd482a661320e48c2880dd6ce960360545a - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_mistral scm: git src: https://opendev.org/openstack/openstack-ansible-os_mistral - version: f79a4a7c4b989b7036cbbe5c8f6619f37de14412 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_murano scm: git src: https://opendev.org/openstack/openstack-ansible-os_murano - version: 9211adc426416cd6171c758b875dc492c9d474e9 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron - version: 39de975c90d83ca9f5b1c40d3d26ffe81675d2a2 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova - version: 559fc4cb89d2cc1de71d143e37fc7730ab69684a - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-25' - name: os_octavia scm: git src: https://opendev.org/openstack/openstack-ansible-os_octavia - version: 89547db22bd49951d7749edb7b2c9302c51346da - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_placement scm: git src: https://opendev.org/openstack/openstack-ansible-os_placement - version: 90bea66c8634bccfc3ba730338af764e2455d9bd - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_rally scm: git src: https://opendev.org/openstack/openstack-ansible-os_rally - version: fc97514ff219b700a78eb16aa2dc5b31736d58d7 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_sahara scm: git src: https://opendev.org/openstack/openstack-ansible-os_sahara - version: 2aa1a0447347cdd9653f81ce7a5f69ddb1330b83 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_senlin scm: git src: https://opendev.org/openstack/openstack-ansible-os_senlin - version: 9869c80a4d4aab838aebc917a7e282f47a025f1a - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_swift scm: git src: https://opendev.org/openstack/openstack-ansible-os_swift - version: eb526ea943ecd0685def7d06742c6263be75366e - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_tacker scm: git src: https://opendev.org/openstack/openstack-ansible-os_tacker - version: f11604d0b0acf3dbb083fc77d47bcf27bea9b72b - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_tempest scm: git src: https://opendev.org/openstack/openstack-ansible-os_tempest - version: 0334ea5ccb1b0ce483aa4389e986bfff81bc9e61 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_trove scm: git src: https://opendev.org/openstack/openstack-ansible-os_trove - version: d873d6904a1a6b712323fdc4eb3e6304eaf784e1 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: os_zun scm: git src: https://opendev.org/openstack/openstack-ansible-os_zun - version: 4c2e9647aea9f67cf0d31e46d307cfb6de6b380b - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: qdrouterd scm: git @@ -260,14 +260,14 @@ - name: rabbitmq_server scm: git src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - version: 220a90cfda02fdd5a2e310bb25a6b3e9e377dd11 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-29' - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server - version: c74a6392a41b22a2928343849ae6b7dfa3340440 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: etcd scm: git @@ -308,42 +308,42 @@ - name: systemd_service src: https://opendev.org/openstack/ansible-role-systemd_service scm: git - version: 94a19ee239e1e2c9d5ea03241258cefd7f722ee2 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: systemd_mount src: https://opendev.org/openstack/ansible-role-systemd_mount scm: git - version: d776afb14016ac4a9add3c88e4ff17175db95506 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: systemd_networkd src: https://opendev.org/openstack/ansible-role-systemd_networkd scm: git - version: 17f3f6780506232855395c5a9c36e96267ebe6cb - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: python_venv_build src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git - version: 22a4aa776d0845b6e30fd423d3f0baef86a08820 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-24' - name: uwsgi src: https://opendev.org/openstack/ansible-role-uwsgi scm: git - version: c483d53c8c677126a882350ce5b5c6ec89c023d4 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: pki src: https://opendev.org/openstack/ansible-role-pki scm: git - version: 39f8654cd423e7297a566305d66ac9a89d97a626 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' - name: zookeeper src: https://opendev.org/openstack/ansible-role-zookeeper scm: git - version: 8ee3bd4f3f7f5688fc084875e017a279ab8eaa76 - trackbranch: stable/2023.1 + version: master + trackbranch: master shallow_since: '2023-05-23' diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py index 6870bddcd5..f2d472517d 100644 --- a/deploy-guide/source/conf.py +++ b/deploy-guide/source/conf.py @@ -32,8 +32,8 @@ import openstackdocstheme # Variables to override target_name = 'openstack-ansible' description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.' -previous_series_name = 'zed' -current_series_name = '2023.1' +previous_series_name = '2023.1' +current_series_name = '2023.2' # General information about the project. author = 'OpenStack-Ansible Contributors' diff --git a/doc/source/admin/upgrades/major-upgrades.rst b/doc/source/admin/upgrades/major-upgrades.rst index da98e32204..19f6b7982f 100644 --- a/doc/source/admin/upgrades/major-upgrades.rst +++ b/doc/source/admin/upgrades/major-upgrades.rst @@ -155,12 +155,6 @@ Please review the contents of the playbook for more information. # openstack-ansible "${SCRIPTS_PATH}/upgrade-utilities/deploy-config-changes.yml" -Ensure that you have defined all required variables for current Neutron plugin - -.. code-block:: console - - # openstack-ansible "${SCRIPTS_PATH}/upgrade-utilities/define-neutron-plugin.yml" - Upgrade hosts ~~~~~~~~~~~~~ @@ -171,16 +165,7 @@ Before installing the infrastructure and OpenStack, update the host machines. Usage of non-trusted certificates for RabbitMQ is not possible due to requirements of newer ``amqp`` versions. -The SSH certificate authority must be updated for the upgraded release -version. SSH certificates are used for nova live migration and keystone -credential synchonrisation in the new release. This step ensures that -the required CA is generated and available for other playbooks. - -.. code-block:: console - - # openstack-ansible certificate-ssh-authority.yml - -Once CA is generated, we can proceed with standard OpenStack upgrade steps: +After that you can proceed with standard OpenStack upgrade steps: .. code-block:: console diff --git a/doc/source/conf.py b/doc/source/conf.py index 0ab15293fc..45ec460945 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -33,9 +33,9 @@ import yaml # Variables to override target_name = 'openstack-ansible' description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.' -previous_series_name = 'zed' -previous_slurp_name = 'yoga' -current_series_name = '2023.1' +previous_series_name = '2023.1' +previous_slurp_name = False +current_series_name = '2023.2' # General information about the project. author = 'OpenStack-Ansible Contributors' diff --git a/doc/source/index.rst b/doc/source/index.rst index 9f4679e025..9d53ba271e 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -9,10 +9,10 @@ configuration of an OpenStack environment. Documentation for each of the following releases is available. -2023.1 (Antelope): Under Development -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +2023.2 (Bobcat): Under Development +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -OpenStack-Ansible 2023.1 (Antelope) is currently Under Development. +OpenStack-Ansible 2023.2 (Bobcat) is currently Under Development. .. toctree:: :maxdepth: 1 @@ -25,6 +25,19 @@ OpenStack-Ansible 2023.1 (Antelope) is currently Under Development. contributor/index reference/index +2023.1 (Antelope): Maintained +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +OpenStack-Ansible 2023.1 (Antelope) was first released with the 27.0.0 tag on +1 June 2023. + +* `OpenStack-Ansible 2023.1 Documentation`_ + +* `OpenStack-Ansible 2023.1 series release notes`_ + +.. _OpenStack-Ansible 2023.1 Documentation: https://docs.openstack.org/openstack-ansible/2023.1/ +.. _OpenStack-Ansible 2023.1 series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/2023.1.html + Zed: Maintained ~~~~~~~~~~~~~~~ diff --git a/inventory/group_vars/adjutant_all/source_git.yml b/inventory/group_vars/adjutant_all/source_git.yml index 06332601db..efa641149d 100644 --- a/inventory/group_vars/adjutant_all/source_git.yml +++ b/inventory/group_vars/adjutant_all/source_git.yml @@ -18,4 +18,4 @@ ## Adjutant service adjutant_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant" adjutant_git_install_branch: df8c3e4a8b70be8697ac46f0acec9169752b4698 -adjutant_git_track_branch: stable/2023.1 +adjutant_git_track_branch: master diff --git a/inventory/group_vars/all/source_git.yml b/inventory/group_vars/all/source_git.yml index 0997eb50a5..66db7d07ca 100644 --- a/inventory/group_vars/all/source_git.yml +++ b/inventory/group_vars/all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 18.05.2023 ### +### HEAD as of 31.05.2023 ### ## Global Requirements requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements" -requirements_git_install_branch: 92e17ec0794879e010ed4ba754b5ee1246bfe917 -requirements_git_track_branch: stable/2023.1 +requirements_git_install_branch: b6973fb0da443080723ee85204bee6e73ffd60a9 +requirements_git_track_branch: master diff --git a/inventory/group_vars/aodh_all/source_git.yml b/inventory/group_vars/aodh_all/source_git.yml index 48795f75e5..380e201620 100644 --- a/inventory/group_vars/aodh_all/source_git.yml +++ b/inventory/group_vars/aodh_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 18.05.2023 ### +### HEAD as of 31.05.2023 ### ## Aodh service aodh_git_repo: "{{ openstack_opendev_base_url }}/openstack/aodh" -aodh_git_install_branch: 31b518d83836adf80111cb6bbec7f7b30246e8e7 -aodh_git_track_branch: stable/2023.1 +aodh_git_install_branch: 94dc273712415910b951113633fe8a76ca9f72f8 +aodh_git_track_branch: master diff --git a/inventory/group_vars/barbican_all/source_git.yml b/inventory/group_vars/barbican_all/source_git.yml index 44617584d1..854f2b8e62 100644 --- a/inventory/group_vars/barbican_all/source_git.yml +++ b/inventory/group_vars/barbican_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 18.05.2023 ### +### HEAD as of 31.05.2023 ### ## Barbican service barbican_git_repo: "{{ openstack_opendev_base_url }}/openstack/barbican" -barbican_git_install_branch: b38b21392ab3bba8df5be16730dda2e13c92e55c -barbican_git_track_branch: stable/2023.1 +barbican_git_install_branch: 3c1c30918dfa7daccf6e8729bedfde774c65235d +barbican_git_track_branch: master diff --git a/inventory/group_vars/blazar_all/source_git.yml b/inventory/group_vars/blazar_all/source_git.yml index 9e165a13e4..a75ff90b0f 100644 --- a/inventory/group_vars/blazar_all/source_git.yml +++ b/inventory/group_vars/blazar_all/source_git.yml @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 22.03.2023 ### +### HEAD as of 31.05.2023 ### ## Blazar service blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar" -blazar_git_install_branch: 24ca97091bcb0d231af98276a6e80013a170d438 -blazar_git_track_branch: stable/2023.1 +blazar_git_install_branch: cf383ae3a56438a7814b6897d85e00534fb86580 +blazar_git_track_branch: master ## Blazar Nova Service blazar_nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar-nova" -blazar_nova_git_install_branch: bec9434e93ad1baf4a08eb0bd83ad8af83def93e -blazar_nova_git_track_branch: stable/2023.1 +blazar_nova_git_install_branch: 021780c99d85eeb4cf5ba653bd1c1501e2c88130 +blazar_nova_git_track_branch: master diff --git a/inventory/group_vars/ceilometer_all/source_git.yml b/inventory/group_vars/ceilometer_all/source_git.yml index 57189b8265..875f37604f 100644 --- a/inventory/group_vars/ceilometer_all/source_git.yml +++ b/inventory/group_vars/ceilometer_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 18.05.2023 ### +### HEAD as of 31.05.2023 ### ## Ceilometer service ceilometer_git_repo: "{{ openstack_opendev_base_url }}/openstack/ceilometer" -ceilometer_git_install_branch: d9a61da15033a55b5730974a9c6a4868c1d98d0f -ceilometer_git_track_branch: stable/2023.1 +ceilometer_git_install_branch: 8e46629357d84f68c3085bde45ba46f72154a081 +ceilometer_git_track_branch: master diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml index 641d5d015e..27ecd09225 100644 --- a/inventory/group_vars/cinder_all/source_git.yml +++ b/inventory/group_vars/cinder_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.05.2023 ### +### HEAD as of 31.05.2023 ### ## Cinder service cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder" -cinder_git_install_branch: 1ae052c976ba3a3edb57f3ecd1ce0580305bd03f -cinder_git_track_branch: stable/2023.1 +cinder_git_install_branch: 77b6035e4fd8931f40370d0534245100128275d9 +cinder_git_track_branch: master diff --git a/inventory/group_vars/cloudkitty_all/source_git.yml b/inventory/group_vars/cloudkitty_all/source_git.yml index b1ec6e69d5..2f86cadd77 100644 --- a/inventory/group_vars/cloudkitty_all/source_git.yml +++ b/inventory/group_vars/cloudkitty_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 18.05.2023 ### +### HEAD as of 31.05.2023 ### ## Cloudkitty service cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty" -cloudkitty_git_install_branch: dd5c9fdaa48a1527b3dcd1ce55105c6ec4338fa8 -cloudkitty_git_track_branch: stable/2023.1 +cloudkitty_git_install_branch: 5d024fc33fc4d8ce6500d16668b9857aee49bd85 +cloudkitty_git_track_branch: master diff --git a/inventory/group_vars/designate_all/source_git.yml b/inventory/group_vars/designate_all/source_git.yml index f99cf1ea96..259a4c46af 100644 --- a/inventory/group_vars/designate_all/source_git.yml +++ b/inventory/group_vars/designate_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 18.05.2023 ### +### HEAD as of 31.05.2023 ### ## Designate service designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate" -designate_git_install_branch: 38b100a6fb775ab5f1b566294b2c2d72f889300f -designate_git_track_branch: stable/2023.1 +designate_git_install_branch: d8b019942f44c1d709df6a1bb29eed200b37c42f +designate_git_track_branch: master diff --git a/inventory/group_vars/glance_all/source_git.yml b/inventory/group_vars/glance_all/source_git.yml index 562155e695..a72f72d183 100644 --- a/inventory/group_vars/glance_all/source_git.yml +++ b/inventory/group_vars/glance_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 22.03.2023 ### +### HEAD as of 31.05.2023 ### ## Glance service glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance" -glance_git_install_branch: 285021bdb0ea344f995508fabb8b4e2485f2cf3c -glance_git_track_branch: stable/2023.1 +glance_git_install_branch: dca70d1ca8f6c5947bea0b5a623843b68cfb5d15 +glance_git_track_branch: master diff --git a/inventory/group_vars/heat_all/source_git.yml b/inventory/group_vars/heat_all/source_git.yml index 8848ea55c1..caa19763d9 100644 --- a/inventory/group_vars/heat_all/source_git.yml +++ b/inventory/group_vars/heat_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 22.03.2023 ### +### HEAD as of 31.05.2023 ### ## Heat service heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat" -heat_git_install_branch: 6a4c7b57b8383bef4a02fb485e781c4cbb2a03d8 -heat_git_track_branch: stable/2023.1 +heat_git_install_branch: 3893c4321ad0f2d06c5e28a2792e51d61f4c0653 +heat_git_track_branch: master diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml index 1d09cb07d0..053997ae90 100644 --- a/inventory/group_vars/horizon_all/source_git.yml +++ b/inventory/group_vars/horizon_all/source_git.yml @@ -13,17 +13,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.05.2023 ### +### HEAD as of 31.05.2023 ### ## Horizon service horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon" -horizon_git_install_branch: cbbc7d362167dd8804990d2dd24b55c8dec8df4b -horizon_git_track_branch: stable/2023.1 +horizon_git_install_branch: 3c5006efb4533e1cf0815fb80ede86b7a38a40bf +horizon_git_track_branch: master ## Adjutant dashboard plugin adjutant_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/adjutant-ui" adjutant_dashboard_git_install_branch: 6fa9478b154ba07e4c70aba6c8fa6cc65450fb42 -adjutant_dashboard_git_track_branch: stable/2023.1 +adjutant_dashboard_git_track_branch: master ## Barbican dashboard plugin barbican_dashboard_git_repo: "{{ openstack_opendev_base_url }}//openstack/barbican-ui" @@ -32,50 +32,50 @@ barbican_dashboard_git_track_branch: master ## Cloudkitty dashboard plugin cloudkitty_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty-dashboard" -cloudkitty_dashboard_git_install_branch: cdf1214d39949db242420f0e5a1403ab1be7a73f -cloudkitty_dashboard_git_track_branch: stable/2023.1 +cloudkitty_dashboard_git_install_branch: 7123b765d0f7a03bb4c13f74c3b6b65e184c2122 +cloudkitty_dashboard_git_track_branch: master ## Horizon Designate dashboard plugin designate_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate-dashboard" -designate_dashboard_git_install_branch: 7bc6a1fc3828d529df37b05f15a84dc8be4223b7 -designate_dashboard_git_track_branch: stable/2023.1 +designate_dashboard_git_install_branch: fd72a687cb4c948491681210e21ad88535a98d34 +designate_dashboard_git_track_branch: master ## Horizon Heat dashboard plugin heat_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat-dashboard" -heat_dashboard_git_install_branch: 007a7a5a3b338543dd6e3badd04967324e8f0e9b -heat_dashboard_git_track_branch: stable/2023.1 +heat_dashboard_git_install_branch: dcaa644bdcaa42c9727ffb1ea267bc3ec4f23b0d +heat_dashboard_git_track_branch: master ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: "{{ openstack_opendev_base_url}}/openstack/ironic-ui" -ironic_dashboard_git_install_branch: 2b93b84b90b2a5953a68bde6e9ee0d15df6e5e83 -ironic_dashboard_git_track_branch: stable/2023.1 +ironic_dashboard_git_install_branch: 676aef6bbfe886cfbc8f8cc617cd8a271b8e85b2 +ironic_dashboard_git_track_branch: master ## Horizon Magnum dashboard plugin magnum_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum-ui" -magnum_dashboard_git_install_branch: 7bdcf6017fa51859aab015f8db61fcaf4f719fc7 -magnum_dashboard_git_track_branch: stable/2023.1 +magnum_dashboard_git_install_branch: 3954cea91cad465ac50057da716658479e757602 +magnum_dashboard_git_track_branch: master ## Horizon Masakari dashboard plugin masakari_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-dashboard" -masakari_dashboard_git_install_branch: 8c7435371df311c8c362fa99007d0d76852d7d79 -masakari_dashboard_git_track_branch: stable/2023.1 +masakari_dashboard_git_install_branch: c1928878d0fefa79a080aeb34693b629f9f822fb +masakari_dashboard_git_track_branch: master ## Horizon Murano dashboard plugin murano_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano-dashboard" -murano_dashboard_git_install_branch: 6c93b2ca8a840b1299ebf4b654f2ce041374f808 -murano_dashboard_git_track_branch: stable/2023.1 +murano_dashboard_git_install_branch: 2c1c88a708c348728a5941cc91b538ad68658287 +murano_dashboard_git_track_branch: master ## Horizon Sahara dashboard plugin sahara_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara-dashboard" -sahara_dashboard_git_install_branch: 628ccfadc3922852fb02ad6c26f74ed8f77f7f75 -sahara_dashboard_git_track_branch: stable/2023.1 +sahara_dashboard_git_install_branch: c830376eaf5a8328347b1eacf5fa2fadda67a76b +sahara_dashboard_git_track_branch: master ## Horizon Trove dashboard plugin trove_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove-dashboard" -trove_dashboard_git_install_branch: aadf4a9ce2ed542e6b68e3c2f212fef9d9948b50 -trove_dashboard_git_track_branch: stable/2023.1 +trove_dashboard_git_install_branch: 522b72835887175eb8e94042e113207db1dd5fa7 +trove_dashboard_git_track_branch: master ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia-dashboard" -octavia_dashboard_git_install_branch: d1a6dd8995c0fcd7333408eae4f38437f65ef9b8 -octavia_dashboard_git_track_branch: stable/2023.1 +octavia_dashboard_git_install_branch: b50b1eb5edc625be9bfca2ac3a3140eaf22284a5 +octavia_dashboard_git_track_branch: master diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml index 875fb41837..125eb63a4a 100644 --- a/inventory/group_vars/ironic_all/source_git.yml +++ b/inventory/group_vars/ironic_all/source_git.yml @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.05.2023 ### +### HEAD as of 31.05.2023 ### ## Ironic service ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic" -ironic_git_install_branch: d72eb004ed48dc71b6dfe54a1a2cbbbae813de01 -ironic_git_track_branch: stable/2023.1 +ironic_git_install_branch: 2bd69444d927fb9cbf79bfc1494be9bf6e9c2e29 +ironic_git_track_branch: master ## Ironic inspector service ironic_inspector_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic-inspector" -ironic_inspector_git_install_branch: 8258f1e15a7d76063b26cdd20d4ef9b0ec8d643a -ironic_inspector_git_track_branch: stable/2023.1 +ironic_inspector_git_install_branch: 62e42d38001d39dbc5c47d85e004057cdd53cf08 +ironic_inspector_git_track_branch: master diff --git a/inventory/group_vars/keystone_all/source_git.yml b/inventory/group_vars/keystone_all/source_git.yml index fa1977e6e2..3ae242f2df 100644 --- a/inventory/group_vars/keystone_all/source_git.yml +++ b/inventory/group_vars/keystone_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 18.05.2023 ### +### HEAD as of 31.05.2023 ### ## Keystone service keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone" -keystone_git_install_branch: 040e6d09b1e7e6817c81209c2b089d318715bef6 -keystone_git_track_branch: stable/2023.1 +keystone_git_install_branch: 74ea58e0b9d774f3a27719f6c4542e182794c055 +keystone_git_track_branch: master diff --git a/inventory/group_vars/magnum_all/source_git.yml b/inventory/group_vars/magnum_all/source_git.yml index 78ed2df048..b729464417 100644 --- a/inventory/group_vars/magnum_all/source_git.yml +++ b/inventory/group_vars/magnum_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 18.05.2023 ### +### HEAD as of 31.05.2023 ### ## Magnum service magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum" -magnum_git_install_branch: a4d8145f8871e1da6885e6cea4f9cb3c41767434 -magnum_git_track_branch: stable/2023.1 +magnum_git_install_branch: a1252ec5534d9c5f50a1af783b91645515418c63 +magnum_git_track_branch: master diff --git a/inventory/group_vars/manila_all/source_git.yml b/inventory/group_vars/manila_all/source_git.yml index fa80454d82..9b495299cc 100644 --- a/inventory/group_vars/manila_all/source_git.yml +++ b/inventory/group_vars/manila_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 18.05.2023 ### +### HEAD as of 31.05.2023 ### ## Manila service manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila" -manila_git_install_branch: 712202d2bc89faf48525028fe0bb3aef984addf8 -manila_git_track_branch: stable/2023.1 +manila_git_install_branch: bc70c12b895b05e4acddee27466b4ef83dcd62a0 +manila_git_track_branch: master diff --git a/inventory/group_vars/masakari_all/source_git.yml b/inventory/group_vars/masakari_all/source_git.yml index 478ab59b16..cc3dd7c01f 100644 --- a/inventory/group_vars/masakari_all/source_git.yml +++ b/inventory/group_vars/masakari_all/source_git.yml @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 22.03.2023 ### +### HEAD as of 31.05.2023 ### ## Masakari service masakari_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari" -masakari_git_install_branch: 72b6929271a38b87cf43489fd9ce28e35c41cedb -masakari_git_track_branch: stable/2023.1 +masakari_git_install_branch: b2f2a58e3c3b4cdb3801e1d09b0a1f5aa62fc4ce +masakari_git_track_branch: master ## Masakari monitors services masakari_monitors_git_repo: "{{ openstack_opendev_base_url }}/openstack/masakari-monitors" -masakari_monitors_git_install_branch: 9192f777840a45a5bc14e261813004ecfc59cf45 -masakari_monitors_git_track_branch: stable/2023.1 +masakari_monitors_git_install_branch: 4aa998d492143f63d5ac32c6c000dff81e69a7af +masakari_monitors_git_track_branch: master diff --git a/inventory/group_vars/mistral_all/source_git.yml b/inventory/group_vars/mistral_all/source_git.yml index 82e60ca903..8c1a658dfd 100644 --- a/inventory/group_vars/mistral_all/source_git.yml +++ b/inventory/group_vars/mistral_all/source_git.yml @@ -13,13 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 22.03.2023 ### +### HEAD as of 31.05.2023 ### ## Mistral service mistral_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral" -mistral_git_install_branch: af2b9c5cd8d3bca74f560491fb140809fc27931c -mistral_git_track_branch: stable/2023.1 +mistral_git_install_branch: d6b7f7305d249a5beaacddc90bbc1003680fdb87 +mistral_git_track_branch: master mistral_extra_git_repo: "{{ openstack_opendev_base_url }}/openstack/mistral-extra" -mistral_extra_git_install_branch: e0687d607319b796503859353b8f3ab1cc9aa9f5 -mistral_extra_git_track_branch: stable/2023.1 +mistral_extra_git_install_branch: 44b3e5dff55d3d4ee9994ebf4fd6cf55447d4589 +mistral_extra_git_track_branch: master diff --git a/inventory/group_vars/murano_all/source_git.yml b/inventory/group_vars/murano_all/source_git.yml index 3ea1c3e81b..83960a0f66 100644 --- a/inventory/group_vars/murano_all/source_git.yml +++ b/inventory/group_vars/murano_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 22.03.2023 ### +### HEAD as of 31.05.2023 ### ## Murano service murano_git_repo: "{{ openstack_opendev_base_url }}/openstack/murano" -murano_git_install_branch: 19dc9648e1a760037b7a67a3ec169483b3bc0609 -murano_git_track_branch: stable/2023.1 +murano_git_install_branch: 9a84d271cbe45b21a3080a0a9f82a4bced5f38c4 +murano_git_track_branch: master diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml index a276a9a7ac..c4d6dce9cf 100644 --- a/inventory/group_vars/neutron_all/source_git.yml +++ b/inventory/group_vars/neutron_all/source_git.yml @@ -13,36 +13,36 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.05.2023 ### +### HEAD as of 31.05.2023 ### ## Neutron service neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron" -neutron_git_install_branch: 6d9f481d875310a5184660a86388213f0f86dbb6 -neutron_git_track_branch: stable/2023.1 +neutron_git_install_branch: 3fc97633a066d2eaa563b589402058255ca61354 +neutron_git_track_branch: master neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas" -neutron_vpnaas_git_install_branch: 6ed22d4d75112a19aabde2816694d94e44ca16a2 -neutron_vpnaas_git_track_branch: stable/2023.1 +neutron_vpnaas_git_install_branch: 97e5d0332c669138ed9f81f031568181ffffa644 +neutron_vpnaas_git_track_branch: master neutron_dynamic_routing_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-dynamic-routing" -neutron_dynamic_routing_git_install_branch: 13e0d8a63dbdbd9e1a863144999794d4fc9af22d -neutron_dynamic_routing_git_track_branch: stable/2023.1 +neutron_dynamic_routing_git_install_branch: 513ea649be9fd652b0c5b391167f851bc3d653bb +neutron_dynamic_routing_git_track_branch: master networking_odl_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-odl" -networking_odl_git_install_branch: 48936559c71606d5e43fba1ad4382d74110e7d01 -networking_odl_git_track_branch: stable/2023.1 +networking_odl_git_install_branch: b5100912f0930e37f7f2bd176a791e4c11836723 +networking_odl_git_track_branch: master networking_bgpvpn_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-bgpvpn" -networking_bgpvpn_git_install_branch: 039fdc096e0971b90a96ea07a2ef6e3196858594 -networking_bgpvpn_git_track_branch: stable/2023.1 +networking_bgpvpn_git_install_branch: ce690c88031232f21a558142183b17d2ef8fa509 +networking_bgpvpn_git_track_branch: master networking_sfc_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-sfc" -networking_sfc_git_install_branch: a93b4de04b0f1e34119ab306331b211c0c9dd815 -networking_sfc_git_track_branch: stable/2023.1 +networking_sfc_git_install_branch: da019219b4b96f5d9f2317c6a7fe6eec61c47349 +networking_sfc_git_track_branch: master networking_generic_switch_git_repo: "{{ openstack_opendev_base_url}}/openstack/networking-generic-switch" -networking_generic_switch_git_install_branch: 6dcc83c4bac921cbcfc37ece974287f095611883 -networking_generic_switch_git_track_branch: stable/2023.1 +networking_generic_switch_git_install_branch: 5246705d24224d9c5cb6d9befd0542162c4ff737 +networking_generic_switch_git_track_branch: master networking_nsx_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsx" networking_nsx_git_install_branch: 0253265f75f63d5619b30f16a6b64459dec79d82 @@ -53,5 +53,5 @@ networking_nsxlib_git_install_branch: 77688b9934fd61c7c1ada52da92252b12979bbee networking_nsxlib_git_track_branch: master networking_baremetal_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-baremetal" -networking_baremetal_git_install_branch: 1529ce98313336e2ef431bc1113139b790d1c92c -networking_baremetal_git_track_branch: stable/2023.1 +networking_baremetal_git_install_branch: 639b0afd18d149e2368de718f4f23b6fee742a65 +networking_baremetal_git_track_branch: master diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml index 13ddcdb074..b3a3cf5c6f 100644 --- a/inventory/group_vars/nova_all/source_git.yml +++ b/inventory/group_vars/nova_all/source_git.yml @@ -23,7 +23,7 @@ ## * 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. -### HEAD as of 18.05.2023 ### +### HEAD as of 31.05.2023 ### ## NOVNC from source novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC" @@ -37,5 +37,5 @@ spicehtml5_git_track_branch: master ## Nova service nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova" -nova_git_install_branch: b9089acc627602893efc2dc3e456395d4147f518 -nova_git_track_branch: stable/2023.1 +nova_git_install_branch: 971809b4d4db39e98d6534531e55d5b8fcde49cb +nova_git_track_branch: master diff --git a/inventory/group_vars/octavia_all/source_git.yml b/inventory/group_vars/octavia_all/source_git.yml index a8b4bcf455..88ce7a2af8 100644 --- a/inventory/group_vars/octavia_all/source_git.yml +++ b/inventory/group_vars/octavia_all/source_git.yml @@ -13,14 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.05.2023 ### +### HEAD as of 31.05.2023 ### ## Octavia service octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia" -octavia_git_install_branch: 920dbfa5ad7d529ba0ee6ae2162fb73ddfc8ec13 -octavia_git_track_branch: stable/2023.1 +octavia_git_install_branch: e2bc07222f40ce5c6ba73a0e4bf79af9f5ebde11 +octavia_git_track_branch: master ## Octavia OVN provider octavia_ovn_octavia_provider_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-octavia-provider" -octavia_ovn_octavia_provider_git_install_branch: f6537b1d90a10d4e9bd03e93a2018d312df656bc -octavia_ovn_octavia_provider_git_track_branch: stable/2023.1 +octavia_ovn_octavia_provider_git_install_branch: ede9b1930936ed519efbb18cfdfe9ee44628147c +octavia_ovn_octavia_provider_git_track_branch: master diff --git a/inventory/group_vars/placement_all/source_git.yml b/inventory/group_vars/placement_all/source_git.yml index 63baad9e79..65c6eae694 100644 --- a/inventory/group_vars/placement_all/source_git.yml +++ b/inventory/group_vars/placement_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 22.03.2023 ### +### HEAD as of 31.05.2023 ### ## Placement service placement_git_repo: "{{ openstack_opendev_base_url }}/openstack/placement" -placement_git_install_branch: b3652feea1855c9481c9441976379d9851c0c62f -placement_git_track_branch: stable/2023.1 +placement_git_install_branch: e62c3a6fea81c1644d81d42d01b21b22ff230807 +placement_git_track_branch: master diff --git a/inventory/group_vars/sahara_all/source_git.yml b/inventory/group_vars/sahara_all/source_git.yml index 0b1bd646a7..1df55ac296 100644 --- a/inventory/group_vars/sahara_all/source_git.yml +++ b/inventory/group_vars/sahara_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 24.05.2023 ### +### HEAD as of 31.05.2023 ### ## Sahara service sahara_git_repo: "{{ openstack_opendev_base_url }}/openstack/sahara" -sahara_git_install_branch: d57584b779751d8314416dd68b4460f8a8f7dbec -sahara_git_track_branch: stable/2023.1 +sahara_git_install_branch: d719543b2ea9598965b08ea4fe514bfc09d06972 +sahara_git_track_branch: master diff --git a/inventory/group_vars/senlin_all/source_git.yml b/inventory/group_vars/senlin_all/source_git.yml index cc57d551cc..49fb4ef94c 100644 --- a/inventory/group_vars/senlin_all/source_git.yml +++ b/inventory/group_vars/senlin_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 22.03.2023 ### +### HEAD as of 31.05.2023 ### ## Senlin service senlin_git_repo: "{{ openstack_opendev_base_url }}/openstack/senlin" -senlin_git_install_branch: 22fd77946723e25e595676e61893c1f645709b2f -senlin_git_track_branch: stable/2023.1 +senlin_git_install_branch: 6eee2f4153eb0f2ffab88792d75221b3ef6d4a0b +senlin_git_track_branch: master diff --git a/inventory/group_vars/swift_all/source_git.yml b/inventory/group_vars/swift_all/source_git.yml index 4a0e1776d5..cb2bf9f68c 100644 --- a/inventory/group_vars/swift_all/source_git.yml +++ b/inventory/group_vars/swift_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 30.05.2023 ### +### HEAD as of 31.05.2023 ### ## Swift service swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift" -swift_git_install_branch: 149b617c28514c36d1dec57232cce883375f1dbb +swift_git_install_branch: eb3fe260d51d021674b2bccc4b9d1b4cc0757450 swift_git_track_branch: master diff --git a/inventory/group_vars/tacker_all/source_git.yml b/inventory/group_vars/tacker_all/source_git.yml index 10e1fc18da..24dc54e090 100644 --- a/inventory/group_vars/tacker_all/source_git.yml +++ b/inventory/group_vars/tacker_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 22.03.2023 ### +### HEAD as of 31.05.2023 ### ## Tacker service tacker_git_repo: "{{ openstack_opendev_base_url }}/openstack/tacker" -tacker_git_install_branch: 40a15b59455fdc6b34eecd641af514d32888a5a2 -tacker_git_track_branch: stable/2023.1 +tacker_git_install_branch: 0becf595f42c35bc32d498ba40a4e7bc4b136343 +tacker_git_track_branch: master diff --git a/inventory/group_vars/trove_all/source_git.yml b/inventory/group_vars/trove_all/source_git.yml index bd1719c425..08c6c9d70a 100644 --- a/inventory/group_vars/trove_all/source_git.yml +++ b/inventory/group_vars/trove_all/source_git.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 24.05.2023 ### +### HEAD as of 31.05.2023 ### ## Trove service trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove" -trove_git_install_branch: fee50052d1b9e9800406aa1037aef3cb04c8fbba -trove_git_track_branch: stable/2023.1 +trove_git_install_branch: e854cb58538f83d7a4538218b27d8ad25d865f35 +trove_git_track_branch: master diff --git a/inventory/group_vars/utility_all/source_git.yml b/inventory/group_vars/utility_all/source_git.yml index dec9a4d8ea..0eb141e45e 100644 --- a/inventory/group_vars/utility_all/source_git.yml +++ b/inventory/group_vars/utility_all/source_git.yml @@ -13,92 +13,92 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 02.03.2023 ### +### HEAD as of 31.05.2023 ### tempest_git_repo: "{{ openstack_opendev_base_url }}/openstack/tempest" -tempest_git_install_branch: 28f7dfa33bd3b73b3bf238ed81a48886b795a928 -tempest_git_track_branch: None +tempest_git_install_branch: 86b8b6204c08aa304b57c0758b2ae3321513614b +tempest_git_track_branch: master 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: None +tempest_plugin_barbican_git_install_branch: b5519a7015b0f28e796d82555c5d82c684896c68 +tempest_plugin_barbican_git_track_branch: master tempest_plugin_cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder-tempest-plugin" -tempest_plugin_cinder_git_install_branch: f80d3af2a4b5a8fd5408fe5cd4b1b3e4b06e8131 -tempest_plugin_cinder_git_track_branch: None +tempest_plugin_cinder_git_install_branch: a8f4fde0194954a7a1d797db2b920c29d2e72dff +tempest_plugin_cinder_git_track_branch: master tempest_plugin_cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty-tempest-plugin" tempest_plugin_cloudkitty_git_install_branch: b62f4684676f5aaa77f77cc68b3c89a618e86a51 -tempest_plugin_cloudkitty_git_track_branch: None +tempest_plugin_cloudkitty_git_track_branch: master tempest_plugin_designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate-tempest-plugin" -tempest_plugin_designate_git_install_branch: 759ee725b804869729cae8b2d6699416bd600b50 -tempest_plugin_designate_git_track_branch: None +tempest_plugin_designate_git_install_branch: 0480597cb6366413a6b841272a8d43ff043b0bcd +tempest_plugin_designate_git_track_branch: master tempest_plugin_glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance-tempest-plugin" -tempest_plugin_glance_git_install_branch: 701b74b15459c0f4c229a92d834697ba527c4ed8 -tempest_plugin_glance_git_track_branch: None +tempest_plugin_glance_git_install_branch: d6f7287947731da139413899ddddddcfb95e1a50 +tempest_plugin_glance_git_track_branch: master tempest_plugin_heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat-tempest-plugin" tempest_plugin_heat_git_install_branch: a3719a852c4485ec4a1269f6b4acf7e18432365a -tempest_plugin_heat_git_track_branch: None +tempest_plugin_heat_git_track_branch: master tempest_plugin_ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic-tempest-plugin" -tempest_plugin_ironic_git_install_branch: 5ac31e71ead548508ede771768c59eb845ac7dbc -tempest_plugin_ironic_git_track_branch: None +tempest_plugin_ironic_git_install_branch: d5c0acf7220e2037afb571d2f11d33585a16a215 +tempest_plugin_ironic_git_track_branch: master tempest_plugin_keystone_git_repo: "{{ openstack_opendev_base_url }}/openstack/keystone-tempest-plugin" -tempest_plugin_keystone_git_install_branch: a2b0a5dc59a5bece14d2994cb2085a0d2167fc49 -tempest_plugin_keystone_git_track_branch: None +tempest_plugin_keystone_git_install_branch: dbe56f0a07febd9e8babf54b88c63084b59f0b39 +tempest_plugin_keystone_git_track_branch: master tempest_plugin_magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum-tempest-plugin" tempest_plugin_magnum_git_install_branch: 0805f24e65a8b622649bfc12f9a6657b03b8b683 -tempest_plugin_magnum_git_track_branch: None +tempest_plugin_magnum_git_track_branch: master tempest_plugin_manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila-tempest-plugin" -tempest_plugin_manila_git_install_branch: 0f4e845830812271fc232e0f9079129788e12948 -tempest_plugin_manila_git_track_branch: None +tempest_plugin_manila_git_install_branch: 9cefa379a5b482f19e4f821986b1d92ec5ac84c5 +tempest_plugin_manila_git_track_branch: master 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: None +tempest_plugin_murano_git_track_branch: master tempest_plugin_neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-tempest-plugin" -tempest_plugin_neutron_git_install_branch: 23700da1d3f762906ab92019d999da06ee448126 -tempest_plugin_neutron_git_track_branch: None +tempest_plugin_neutron_git_install_branch: 318d629308287c199ff937c1b4923a09a56f2984 +tempest_plugin_neutron_git_track_branch: master 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: None +tempest_plugin_novajoin_git_track_branch: master tempest_plugin_octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia-tempest-plugin" -tempest_plugin_octavia_git_install_branch: 9e9f526d656b0bc33173de21df2a6d7e3662b68b -tempest_plugin_octavia_git_track_branch: None +tempest_plugin_octavia_git_install_branch: b9af9163cb7a5277e4c72dc1becb563148f7fa1b +tempest_plugin_octavia_git_track_branch: master tempest_plugin_senlin_git_repo: "{{ openstack_opendev_base_url }}/openstack/senlin-tempest-plugin" tempest_plugin_senlin_git_install_branch: 2df1c32df4565127c0c1b9d7d6e454e5b2fe1ffc -tempest_plugin_senlin_git_track_branch: None +tempest_plugin_senlin_git_track_branch: master 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: None +tempest_plugin_sahara_git_track_branch: master tempest_plugin_telemetry_git_repo: "{{ openstack_opendev_base_url }}/openstack/telemetry-tempest-plugin" -tempest_plugin_telemetry_git_install_branch: 5ba27fb82d40b4fddf333def2c38c4497f6a965b -tempest_plugin_telemetry_git_track_branch: None +tempest_plugin_telemetry_git_install_branch: 2064db7dc70b7167d3016d5eef092031733d6e94 +tempest_plugin_telemetry_git_track_branch: master tempest_plugin_trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove-tempest-plugin" -tempest_plugin_trove_git_install_branch: 00b4ef0991236e1ad19832698e5358f76781af46 -tempest_plugin_trove_git_track_branch: None +tempest_plugin_trove_git_install_branch: 1300140f76834f7e8373e799cbeb9e58ffd98b4c +tempest_plugin_trove_git_track_branch: master 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: None +tempest_plugin_zaqar_git_track_branch: master tempest_plugin_zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun-tempest-plugin" tempest_plugin_zun_git_install_branch: 29250bda508c95d0e24f383ca159016385326536 -tempest_plugin_zun_git_track_branch: None +tempest_plugin_zun_git_track_branch: master rally_openstack_git_repo: "{{ openstack_opendev_base_url }}/openstack/rally-openstack" -rally_openstack_git_install_branch: b8591ec366293d60735536f95f0d09a8c18916ca -rally_openstack_git_track_branch: None +rally_openstack_git_install_branch: e5805305e6e172e7530c5c32f5927f587910a33c +rally_openstack_git_track_branch: master diff --git a/inventory/group_vars/zun_all/source_git.yml b/inventory/group_vars/zun_all/source_git.yml index 7aff72b8b0..18639b6b77 100644 --- a/inventory/group_vars/zun_all/source_git.yml +++ b/inventory/group_vars/zun_all/source_git.yml @@ -13,19 +13,19 @@ # See the License for the specific language governing permissions and # limitations under the License. -### HEAD as of 22.03.2023 ### +### HEAD as of 31.05.2023 ### ## Zun service zun_git_repo: "{{ openstack_opendev_base_url }}/openstack/zun" -zun_git_install_branch: 6d4039bc7bc88ecd3caaeee33126ed85e8cf09f0 -zun_git_track_branch: stable/2023.1 +zun_git_install_branch: 4fa358474ee337f27bfaf8b98e886cc8d10ada50 +zun_git_track_branch: master ## Zun kuryr service zun_kuryr_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr-libnetwork" -zun_kuryr_git_install_branch: a6628c266cb364ffddf3f15c2ccb1ee3ee474f44 -zun_kuryr_git_track_branch: stable/2023.1 +zun_kuryr_git_install_branch: 3bce4281376615a1a5b3cc347670261155f4ea50 +zun_kuryr_git_track_branch: master ## Zun kuryr library zun_kuryr_lib_git_repo: "{{ openstack_opendev_base_url }}/openstack/kuryr" -zun_kuryr_lib_git_install_branch: 1616fda8d29814c106ab7a95c5661887516f825a -zun_kuryr_lib_git_track_branch: stable/2023.1 +zun_kuryr_lib_git_install_branch: c11675d137ca302359faa1413c1bf1bc11c63635 +zun_kuryr_lib_git_track_branch: master diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh index 49df25ea8f..a67285b54c 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -60,7 +60,7 @@ if [[ "${ACTION}" =~ "upgrade" ]]; then # Be sure to change this whenever a new stable branch # is created. UPGRADE_ACTION_ARRAY=(${ACTION//_/ }) - export UPGRADE_SOURCE_RELEASE=${UPGRADE_ACTION_ARRAY[1]:-'zed'} + export UPGRADE_SOURCE_RELEASE=${UPGRADE_ACTION_ARRAY[1]:-'2023.1'} export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-stable/$UPGRADE_SOURCE_RELEASE} # Store the target SHA/branch diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh index 77aead91b7..b781b4cbc8 100755 --- a/scripts/run-upgrade.sh +++ b/scripts/run-upgrade.sh @@ -31,10 +31,10 @@ export SCRIPTS_PATH="$(dirname "$(readlink -f "${0}")")" export MAIN_PATH="$(dirname "${SCRIPTS_PATH}")" # The expected source series names -export SUPPORTED_SOURCE_SERIES=("yoga" "zed") +export SUPPORTED_SOURCE_SERIES=("2023.1") # The expected target series name -export TARGET_SERIES="2023.1" +export TARGET_SERIES="2023.2" # The expected OSA config dir export OSA_CONFIG_DIR="${OSA_CONFIG_DIR:-/etc/openstack_deploy}" @@ -195,10 +195,6 @@ function main { pushd ${MAIN_PATH}/playbooks RUN_TASKS+=("${SCRIPTS_PATH}/upgrade-utilities/deploy-config-changes.yml") - if [[ "${SOURCE_SERIES}" == "yoga" ]]; then - RUN_TASKS+=("${SCRIPTS_PATH}/upgrade-utilities/define-neutron-plugin.yml") - RUN_TASKS+=("certificate-ssh-authority.yml") - fi # we don't want to trigger container restarts for galera and rabbit # but as there will be no hosts available for metal deployments, # as a fallback option we just run setup-hosts.yml without any arguments diff --git a/scripts/upgrade-utilities/define-neutron-plugin.yml b/scripts/upgrade-utilities/define-neutron-plugin.yml deleted file mode 100644 index 761f9db65e..0000000000 --- a/scripts/upgrade-utilities/define-neutron-plugin.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -# Copyright 2022 City Network International AB -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Prepare Neutron configuration upgrade for deploying the new release - hosts: localhost - connection: local - gather_facts: false - user: root - vars: - neutron_group: 'neutron_all' - neutron_host_to_check: "{{ groups[neutron_group][0] }}" - tasks: - - name: End task if neutron is not deployed - meta: end_play - when: not groups[neutron_group] - - - name: Define neutron variables for upgrade - lineinfile: - dest: "{{ openstack_config_dir }}/user_neutron_migration.yml" - line: "{{ item.line | to_nice_yaml }}" - state: present - create: true - mode: 0640 - when: item.condition - with_items: - - line: - neutron_plugin_type: ml2.lxb - condition: "{{ 'neutron_plugin_type' not in hostvars[neutron_host_to_check] }}" - - line: - neutron_ml2_drivers_type: "flat,vlan,vxlan,local" - condition: "{{ 'neutron_ml2_drivers_type' not in hostvars[neutron_host_to_check] }}" - - line: - neutron_plugin_base: - - router - - metering - condition: "{{ 'neutron_plugin_base' not in hostvars[neutron_host_to_check] }}" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index c82dbd1232..0a2b63776c 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -525,24 +525,6 @@ parent: openstack-ansible-deploy-aio nodeset: ubuntu-focal -- job: - name: openstack-ansible-upgrade_yoga-aio_metal-ubuntu-focal - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-focal - timeout: 10800 - -- job: - name: openstack-ansible-upgrade_yoga-aio_lxc-ubuntu-focal - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-focal - timeout: 10800 - -- job: - name: openstack-ansible-upgrade_yoga-infra_lxc-ubuntu-focal - parent: openstack-ansible-deploy-aio-infra - nodeset: ubuntu-focal - timeout: 10800 - - job: name: openstack-ansible-deploy-infra_lxc-ubuntu-focal parent: openstack-ansible-deploy-aio-infra diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index b37f572eb1..c67940ea94 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -65,7 +65,6 @@ jobs: - openstack-ansible-upgrade-infra_lxc-rockylinux-9 - openstack-ansible-upgrade-infra_lxc-ubuntu-jammy - - openstack-ansible-upgrade_yoga-infra_lxc-ubuntu-focal gate: jobs: - openstack-ansible-upgrade-infra_lxc-rockylinux-9 @@ -77,7 +76,6 @@ jobs: - openstack-ansible-upgrade-aio_metal-rockylinux-9 - openstack-ansible-upgrade-aio_metal-ubuntu-jammy - - openstack-ansible-upgrade_yoga-aio_metal-ubuntu-focal gate: jobs: - openstack-ansible-upgrade-aio_metal-rockylinux-9 @@ -174,7 +172,6 @@ - openstack-ansible-deploy-aio_metal_tls-ubuntu-jammy - openstack-ansible-upgrade-aio_metal-rockylinux-9 - openstack-ansible-upgrade-aio_metal-ubuntu-jammy - - openstack-ansible-upgrade_yoga-aio_metal-ubuntu-focal gate: jobs: - openstack-ansible-deploy-aio_metal-debian-bullseye