From 11d3797c470c756a2d3f6920ea4a678807b5d1a9 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Fri, 10 Dec 2021 23:14:45 +0200 Subject: [PATCH] Start Yoga development cycle Change-Id: I1da1398df37ec4d5c0dae616d24d3b9a019c1d47 --- ansible-role-requirements.yml | 232 +++++++++--------- doc/source/index.rst | 31 ++- .../repo_packages/openstack_services.yml | 202 +++++++-------- .../repo_packages/openstack_testing.yml | 21 ++ playbooks/os-tempest-install.yml | 1 + scripts/gate-check-commit.sh | 2 +- scripts/run-upgrade.sh | 4 +- .../deploy-config-changes.yml | 28 --- 8 files changed, 264 insertions(+), 257 deletions(-) create mode 100644 playbooks/defaults/repo_packages/openstack_testing.yml diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 9bb1222815..d50119c731 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -1,316 +1,316 @@ - name: ansible-hardening scm: git src: https://opendev.org/openstack/ansible-hardening - version: cda7343ac84c97d1db2c099671402407a0b903a8 - trackbranch: stable/xena + version: master + trackbranch: master - name: apt_package_pinning scm: git src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning - version: fbb457f0183634be50e0f7d1f3a928084044e8f0 - trackbranch: stable/xena + version: master + trackbranch: master - name: galera_server scm: git src: https://opendev.org/openstack/openstack-ansible-galera_server - version: 76bdc362428d436e7dc3f5c3b15a5d815781dc9f - trackbranch: stable/xena + version: master + trackbranch: master - name: ceph_client scm: git src: https://opendev.org/openstack/openstack-ansible-ceph_client - version: 9ebf7eddee15624f5e4e2c5f3cb9695fadc73a15 - trackbranch: stable/xena + version: master + trackbranch: master - name: haproxy_server scm: git src: https://opendev.org/openstack/openstack-ansible-haproxy_server - version: 3abcf462648c70a685ad5e0fefd2ea77ed2ab505 - trackbranch: stable/xena + version: master + trackbranch: master - name: keepalived scm: git src: https://github.com/evrardjp/ansible-keepalived - version: 78fcf28f2c7be772d16740e8154c21a78a19e775 + version: master trackbranch: master - name: lxc_container_create scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_container_create - version: 4d756978fe5e032e1fc1003a86258ce5e832b9e8 - trackbranch: stable/xena + version: master + trackbranch: master - name: lxc_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-lxc_hosts - version: d65aa506d09275089950cf4e55b3836a9938046d - trackbranch: stable/xena + version: master + trackbranch: master - name: memcached_server scm: git src: https://opendev.org/openstack/openstack-ansible-memcached_server - version: 58c403201d9a2ad7e0901a69ece9146b95fb8860 - trackbranch: stable/xena + version: master + trackbranch: master - name: openstack_hosts scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_hosts - version: 2675479dd46b744d727c9a25b7fe7a928cc9be48 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_keystone scm: git src: https://opendev.org/openstack/openstack-ansible-os_keystone - version: 8fab446dec67dfa75ac953ccaee8e2f011c401ae - trackbranch: stable/xena + version: master + trackbranch: master - name: openstack_openrc scm: git src: https://opendev.org/openstack/openstack-ansible-openstack_openrc - version: fc780cb1a354217c43fab8482080194af4a210d6 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_adjutant scm: git src: https://opendev.org/openstack/openstack-ansible-os_adjutant - version: 3b35767d43c326cc89bf912ce0dc844bec78cd3e - trackbranch: stable/xena + version: master + trackbranch: master - name: os_aodh scm: git src: https://opendev.org/openstack/openstack-ansible-os_aodh - version: 609c4c0676fb231706a5b4090a4e250383422297 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_barbican scm: git src: https://opendev.org/openstack/openstack-ansible-os_barbican - version: dcb7e1c74f52a5d7cd457d42536aa8fa361c1d30 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_blazar scm: git src: https://opendev.org/openstack/openstack-ansible-os_blazar - version: 83e72d95cdc12368c90f5b6ab915cf595d50721a - trackbranch: stable/xena + version: master + trackbranch: master - name: os_ceilometer scm: git src: https://opendev.org/openstack/openstack-ansible-os_ceilometer - version: 436228c585b0baf91be6cde6619faf4a5ae768d8 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_cinder scm: git src: https://opendev.org/openstack/openstack-ansible-os_cinder - version: 9d525d4129b7953af133e82f2bd1c74f8b77c61e - trackbranch: stable/xena + version: master + trackbranch: master - name: os_cloudkitty scm: git src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty - version: 0682e7b294452aa93aeaedeb010a0a36e850e909 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_designate scm: git src: https://opendev.org/openstack/openstack-ansible-os_designate - version: 0c3b61217ec347519b9306e4500f0dcb49557859 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_glance scm: git src: https://opendev.org/openstack/openstack-ansible-os_glance - version: 445aab6d91b42c0489dd4a5bad41ee34f118c401 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_gnocchi scm: git src: https://opendev.org/openstack/openstack-ansible-os_gnocchi - version: 886d812bf0165bb8191adf60ee4e065bfeedc861 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_heat scm: git src: https://opendev.org/openstack/openstack-ansible-os_heat - version: ad31c50511ef894b48f8a16ebf46467dc3a2c63f - trackbranch: stable/xena + version: master + trackbranch: master - name: os_horizon scm: git src: https://opendev.org/openstack/openstack-ansible-os_horizon - version: 639d8ae1cca47ed0ca32d11d74e08bed6d422cea - trackbranch: stable/xena + version: master + trackbranch: master - name: os_ironic scm: git src: https://opendev.org/openstack/openstack-ansible-os_ironic - version: 2d93fc88a82a032ca03f6a061b9171cae867dde2 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_magnum scm: git src: https://opendev.org/openstack/openstack-ansible-os_magnum - version: d113f0c0cb2204000768c5075ba2150554feb7d8 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_manila scm: git src: https://opendev.org/openstack/openstack-ansible-os_manila - version: 2365fb40601bc577dcfcbd0875d7f550d569bc50 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_masakari scm: git src: https://opendev.org/openstack/openstack-ansible-os_masakari - version: 492022022d01bff870e2dccfcadf781f25e1fee6 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_mistral scm: git src: https://opendev.org/openstack/openstack-ansible-os_mistral - version: f3fbe6f52fe204a5cbd62ee64b7ada5ce2279d98 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_murano scm: git src: https://opendev.org/openstack/openstack-ansible-os_murano - version: 74bc2d140cc1681911aee7ff810debb22b44fb6d - trackbranch: stable/xena + version: master + trackbranch: master - name: os_neutron scm: git src: https://opendev.org/openstack/openstack-ansible-os_neutron - version: b1d7a6c6ed8eb2890ca927606c06171bd3894192 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_nova scm: git src: https://opendev.org/openstack/openstack-ansible-os_nova - version: 2b74d92657f0983da7abfd6634c753ff3aaad1e2 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_octavia scm: git src: https://opendev.org/openstack/openstack-ansible-os_octavia - version: b2a61da2e4786c3ec0b5cb3890e64edd74e496f8 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_placement scm: git src: https://opendev.org/openstack/openstack-ansible-os_placement - version: 6244bfa1774ad914ef9ab1ea2345298ac83b18e9 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_rally scm: git src: https://opendev.org/openstack/openstack-ansible-os_rally - version: 5cd6439985624ac1ef5faf4cbea25664c8224872 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_sahara scm: git src: https://opendev.org/openstack/openstack-ansible-os_sahara - version: b49f69557e1e8e2d2626ff442ac696c354ea19dc - trackbranch: stable/xena + version: master + trackbranch: master - name: os_senlin scm: git src: https://opendev.org/openstack/openstack-ansible-os_senlin - version: 631bd8c562382f05a1997911aec2151e14d14cda - trackbranch: stable/xena + version: master + trackbranch: master - name: os_swift scm: git src: https://opendev.org/openstack/openstack-ansible-os_swift - version: a7b33376201de2b1bca5ffd0e27f22673bc12689 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_tacker scm: git src: https://opendev.org/openstack/openstack-ansible-os_tacker - version: 570a0e861c54922630ccb8191a4d06dda5653c42 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_tempest scm: git src: https://opendev.org/openstack/openstack-ansible-os_tempest - version: 40509100f3e8bd1858cf50726313cb3a935c183b - trackbranch: stable/xena + version: master + trackbranch: master - name: os_trove scm: git src: https://opendev.org/openstack/openstack-ansible-os_trove - version: 024118851338597b5720fb9dc34e1576794e9a56 - trackbranch: stable/xena + version: master + trackbranch: master - name: os_zun scm: git src: https://opendev.org/openstack/openstack-ansible-os_zun - version: 1c9a9367506588b2a5fbe65068dea7e7c25c1573 - trackbranch: stable/xena + version: master + trackbranch: master - name: plugins scm: git src: https://opendev.org/openstack/openstack-ansible-plugins - version: 1bf80ebc96f984347459eb6833709850816169c6 - trackbranch: stable/xena + version: master + trackbranch: master - name: qdrouterd scm: git src: https://opendev.org/openstack/ansible-role-qdrouterd - version: d7bc864c5596fe2249cf0c06caa0e05ab885ad4d - trackbranch: stable/xena + version: master + trackbranch: master - name: rabbitmq_server scm: git src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server - version: e225bdd9e12b8bceaabedd6de04142293261eaec - trackbranch: stable/xena + version: master + trackbranch: master - name: repo_server scm: git src: https://opendev.org/openstack/openstack-ansible-repo_server - version: 6573c7f512aedbc0c3ced88e9bc8d25d24559dcc - trackbranch: stable/xena + version: master + trackbranch: master - name: rsyslog_client scm: git src: https://opendev.org/openstack/openstack-ansible-rsyslog_client - version: a4ad2c6c3128adc320b24691dd9e356e1e209ae2 - trackbranch: stable/xena + version: master + trackbranch: master - name: rsyslog_server scm: git src: https://opendev.org/openstack/openstack-ansible-rsyslog_server - version: d13007540a12eaafa897e011a3945ddd84f92647 - trackbranch: stable/xena + version: master + trackbranch: master - name: sshd scm: git src: https://github.com/willshersystems/ansible-sshd - version: 214df35c0bee77b5d69f49c2da269251d451b28f + version: master trackbranch: master - name: bird scm: git src: https://github.com/logan2211/ansible-bird - version: 904e55d56f82f36e3e9e9fbc5b3bd932a1151f7b + version: master trackbranch: master - name: etcd scm: git src: https://github.com/logan2211/ansible-etcd - version: ab9861e35c23342fa30c703d29e370da590ea582 + version: master trackbranch: master - name: unbound scm: git src: https://github.com/logan2211/ansible-unbound - version: f8e2d8a89ddb9352d5748332a5f3a33ed33f66ab + version: master trackbranch: master - name: resolvconf scm: git src: https://github.com/logan2211/ansible-resolvconf - version: f7f694b3dd4361e364dccb4ce94e6510727fca2f + version: master trackbranch: master - name: ceph-ansible scm: git src: https://github.com/ceph/ceph-ansible - version: 8a32576d209bc329b4159a781151a7d3a40c5b7d + version: stable-6.0 trackbranch: stable-6.0 shallow_since: '2021-12-08' - name: opendaylight scm: git src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight - version: 4a9217ed0fe9078152435daaa2d3f45b81021b3a + version: master trackbranch: master - name: haproxy_endpoints scm: git src: https://github.com/logan2211/ansible-haproxy-endpoints - version: 8e3a24a35beb16d717072dc83895c5a1f92689fb + version: master trackbranch: master - name: pacemaker_corosync scm: git src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync - version: 70d3c59efea4c3080fa66aeef75eadd0a032a83e + version: master trackbranch: master - name: systemd_service src: https://opendev.org/openstack/ansible-role-systemd_service scm: git - version: 4a5fb95608c2ca490073f7c253fc13c8b1134cd3 - trackbranch: stable/xena + version: master + trackbranch: master - name: systemd_mount src: https://opendev.org/openstack/ansible-role-systemd_mount scm: git - version: eb52a1e6daca04e262a1a5aa3f96a5cf18d17cdb - trackbranch: stable/xena + version: master + trackbranch: master - name: systemd_networkd src: https://opendev.org/openstack/ansible-role-systemd_networkd scm: git - version: 3817a269c6d52882e6ba9e36254f6e37e4cc4cd0 - trackbranch: stable/xena + version: master + trackbranch: master - name: python_venv_build src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git - version: 568011364df031eab8547c553cac29985acac4f0 - trackbranch: stable/xena + version: master + trackbranch: master - name: uwsgi src: https://opendev.org/openstack/ansible-role-uwsgi scm: git - version: 805b4675a25aaa79e8670f6228355ed982252c15 - trackbranch: stable/xena + version: master + trackbranch: master - name: pki src: https://opendev.org/openstack/ansible-role-pki scm: git - version: 64a6bb421085c2f28fb6f306ae71712a67fa3558 - trackbranch: stable/xena + version: master + trackbranch: master diff --git a/doc/source/index.rst b/doc/source/index.rst index c52bd4a069..06b88e8f2f 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -10,22 +10,35 @@ configuration of an OpenStack environment. Documentation for each of the following releases is available. +Yoga: Under Development +~~~~~~~~~~~~~~~~~~~~~~~ + +OpenStack-Ansible Yoga is currently in development. + +.. toctree:: + :maxdepth: 1 + + Deployment guide + Release notes + admin/index + user/index + contributor/contributing + contributor/index + reference/index + + Xena: Maintained ~~~~~~~~~~~~~~~~ OpenStack-Ansible Xena series was first released with the 24.0.0 tag on 10 December 2021. -.. toctree:: - :maxdepth: 1 +* `OpenStack-Ansible Xena Documentation`_ - Deployment guide - Release notes - admin/index - user/index - contributor/contributing - contributor/index - reference/index +* `OpenStack-Ansible Xena series release notes`_ + +.. _OpenStack-Ansible Xena Documentation: https://docs.openstack.org/openstack-ansible/xena/ +.. _OpenStack-Ansible Xena series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/xena.html Wallaby: Maintained diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml index e19c76f43b..7517f8f866 100644 --- a/playbooks/defaults/repo_packages/openstack_services.yml +++ b/playbooks/defaults/repo_packages/openstack_services.yml @@ -31,29 +31,29 @@ ## Global Requirements requirements_git_repo: https://opendev.org/openstack/requirements -requirements_git_install_branch: f5dcb1d64534feb5720400c81089bd2b0765e2c3 # HEAD as of 10.12.2021 -requirements_git_track_branch: stable/xena +requirements_git_install_branch: e74f91e250d127ff825dad5219527d62efaeb740 # HEAD as of 10.12.2021 +requirements_git_track_branch: master ## Adjutant service adjutant_git_repo: https://opendev.org/openstack/adjutant -adjutant_git_install_branch: f8cd1d888fc2335dbc9edcd63e4aa5ff54fac8b7 # HEAD as of 10.12.2021 -adjutant_git_track_branch: stable/xena +adjutant_git_install_branch: b305d7285f3ea2e12210e592702c4d66a31d6646 # HEAD as of 10.12.2021 +adjutant_git_track_branch: master ## Adjutant dashboard plugin adjutant_dashboard_git_repo: https://opendev.org/openstack/adjutant-ui adjutant_dashboard_git_install_branch: 104c474479e9a89d22b96777378ff59983c03393 # HEAD as of 10.12.2021 -adjutant_dashboard_git_track_branch: stable/xena +adjutant_dashboard_git_track_branch: master ## Aodh service aodh_git_repo: https://opendev.org/openstack/aodh -aodh_git_install_branch: 5ac3421cf49cc9ecb972ae856200fce934c54a42 # HEAD as of 10.12.2021 -aodh_git_track_branch: stable/xena +aodh_git_install_branch: 6bbf61a67ba70726f63ff7e287e0e6ad30e4af06 # HEAD as of 10.12.2021 +aodh_git_track_branch: master ## Barbican service barbican_git_repo: https://opendev.org/openstack/barbican -barbican_git_install_branch: 382b5086a2723da8f8d0a07d263ee47a9c6df5e7 # HEAD as of 10.12.2021 -barbican_git_track_branch: stable/xena +barbican_git_install_branch: 45e257b0af20d14fde5ac00d4ab27270f6b0d253 # HEAD as of 10.12.2021 +barbican_git_track_branch: master ## Barbican dashboard plugin @@ -64,108 +64,108 @@ barbican_dashboard_git_track_branch: master ## Ceilometer service ceilometer_git_repo: https://opendev.org/openstack/ceilometer -ceilometer_git_install_branch: 3caca0791881b105731acb4c9c32e8e1221fdfd0 # HEAD as of 10.12.2021 -ceilometer_git_track_branch: stable/xena +ceilometer_git_install_branch: d8c0abee7eee0db3af6c4ca29f35d8dcc36cf0b7 # HEAD as of 10.12.2021 +ceilometer_git_track_branch: master ## Cinder service cinder_git_repo: https://opendev.org/openstack/cinder -cinder_git_install_branch: ecca522214dd850be3cb19af4602ab391f42fe95 # HEAD as of 10.12.2021 -cinder_git_track_branch: stable/xena +cinder_git_install_branch: e5ef39604cb025f341d1ff4ea92d46a2caeb8108 # HEAD as of 10.12.2021 +cinder_git_track_branch: master ## Cloudkitty service cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty -cloudkitty_git_install_branch: c64c6412b00328ba84b2d6f652196af2056b6c1d # HEAD as of 10.12.2021 -cloudkitty_git_track_branch: stable/xena +cloudkitty_git_install_branch: 6ba9d45ea69ea308ae21052e45a8d114c39145da # HEAD as of 10.12.2021 +cloudkitty_git_track_branch: master ## Cloudkitty dashboard plugin cloudkitty_dashboard_git_repo: https://opendev.org/openstack/cloudkitty-dashboard -cloudkitty_dashboard_git_install_branch: 998e7bdc62c1797b730bf872abfff93668025ff9 # HEAD as of 10.12.2021 -cloudkitty_dashboard_git_track_branch: stable/xena +cloudkitty_dashboard_git_install_branch: 92abbc990e3d28d9d53d99f28cb9d450f1cad873 # HEAD as of 10.12.2021 +cloudkitty_dashboard_git_track_branch: master ## Designate service designate_git_repo: https://opendev.org/openstack/designate -designate_git_install_branch: 1356945484b38ef2a0b8888cc6547a681247a907 # HEAD as of 10.12.2021 -designate_git_track_branch: stable/xena +designate_git_install_branch: aa798fc006e0d4bce38751af7b0c14d97b0fecfb # HEAD as of 10.12.2021 +designate_git_track_branch: master ## Horizon Designate dashboard plugin designate_dashboard_git_repo: https://opendev.org/openstack/designate-dashboard -designate_dashboard_git_install_branch: 73dfc628a51a1469c9d312c3cbae758032a79d1b # HEAD as of 10.12.2021 -designate_dashboard_git_track_branch: stable/xena +designate_dashboard_git_install_branch: cddfd050e7fd766177eef8dce8c18d2a44180b21 # HEAD as of 10.12.2021 +designate_dashboard_git_track_branch: master ## Glance service glance_git_repo: https://opendev.org/openstack/glance -glance_git_install_branch: aa7c4acdade2071084a35e42b35c1ec5a8c9990f # HEAD as of 10.12.2021 -glance_git_track_branch: stable/xena +glance_git_install_branch: 4ee7799aa7f6a7172e361392ebb8d3da03e0bf7f # HEAD as of 10.12.2021 +glance_git_track_branch: master ## Heat service heat_git_repo: https://opendev.org/openstack/heat -heat_git_install_branch: ef36cb30495f3b9bb0fc265f13aa4fad00733705 # HEAD as of 10.12.2021 -heat_git_track_branch: stable/xena +heat_git_install_branch: fe8fba8c9823fd001524fe8a2a59b6be201faec4 # HEAD as of 10.12.2021 +heat_git_track_branch: master ## Horizon Heat dashboard plugin heat_dashboard_git_repo: https://opendev.org/openstack/heat-dashboard -heat_dashboard_git_install_branch: 1f52db08edf78f642c059d94b3abb32e014c4876 # HEAD as of 10.12.2021 -heat_dashboard_git_track_branch: stable/xena +heat_dashboard_git_install_branch: 458e9b05191d2ab08749967f7d958f5c08597bc7 # HEAD as of 10.12.2021 +heat_dashboard_git_track_branch: master ## Horizon service horizon_git_repo: https://opendev.org/openstack/horizon -horizon_git_install_branch: d69b1d414760eba09b19e432d67f82e91620d543 # HEAD as of 10.12.2021 -horizon_git_track_branch: stable/xena +horizon_git_install_branch: fc101262810807752819c2da9dc7d533f2ac7440 # HEAD as of 10.12.2021 +horizon_git_track_branch: master ## Horizon Ironic dashboard plugin ironic_dashboard_git_repo: https://opendev.org/openstack/ironic-ui -ironic_dashboard_git_install_branch: 3cd772a7be210ab217b7ae147057aefb6af5cde5 # HEAD as of 10.12.2021 -ironic_dashboard_git_track_branch: stable/xena +ironic_dashboard_git_install_branch: 07e560755ad2b8b5b04862050c64f85a4f9231c1 # HEAD as of 10.12.2021 +ironic_dashboard_git_track_branch: master ## Horizon Magnum dashboard plugin magnum_dashboard_git_repo: https://opendev.org/openstack/magnum-ui -magnum_dashboard_git_install_branch: c7cc455ff25770172325b11e92c41ff965b3810d # HEAD as of 10.12.2021 -magnum_dashboard_git_track_branch: stable/xena +magnum_dashboard_git_install_branch: fede1bee320c18c2f8f3a91d2c375b82e598e7b2 # HEAD as of 10.12.2021 +magnum_dashboard_git_track_branch: master ## Horizon Masakari dashboard plugin masakari_dashboard_git_repo: https://opendev.org/openstack/masakari-dashboard -masakari_dashboard_git_install_branch: fae46199bba14b9d0f746338803fffa898f6532c # HEAD as of 10.12.2021 -masakari_dashboard_git_track_branch: stable/xena +masakari_dashboard_git_install_branch: 021d1c184e5d87b5b4df5e067954f6f1cb46b6c4 # HEAD as of 10.12.2021 +masakari_dashboard_git_track_branch: master ## Horizon Sahara dashboard plugin sahara_dashboard_git_repo: https://opendev.org/openstack/sahara-dashboard -sahara_dashboard_git_install_branch: b59c27efbfc09f669d462ce7a05a66f73011b268 # HEAD as of 10.12.2021 -sahara_dashboard_git_track_branch: stable/xena +sahara_dashboard_git_install_branch: aa9be40a5ec4ae6d4eb9312387e9a5e58b01197f # HEAD as of 10.12.2021 +sahara_dashboard_git_track_branch: master ## Keystone service keystone_git_repo: https://opendev.org/openstack/keystone -keystone_git_install_branch: 20be021347664438520f420eb26168435f7b860b # HEAD as of 10.12.2021 -keystone_git_track_branch: stable/xena +keystone_git_install_branch: fc9efc45b26d23a3b28ac0bc74da3f537dfda89b # HEAD as of 10.12.2021 +keystone_git_track_branch: master ## Manila service manila_git_repo: https://opendev.org/openstack/manila -manila_git_install_branch: 967a6deda4a8848d42b13ff9f0019900b144f590 # HEAD as of 10.12.2021 -manila_git_track_branch: stable/xena +manila_git_install_branch: 5ff97f51a296443948e027a7e1fd302b3984dd16 # HEAD as of 10.12.2021 +manila_git_track_branch: master ## Neutron service neutron_git_repo: https://opendev.org/openstack/neutron -neutron_git_install_branch: e6953e217c731559724971a371e81d2b6f9837e0 # HEAD as of 10.12.2021 -neutron_git_track_branch: stable/xena +neutron_git_install_branch: dd81affb5ee370cc097c94a1b05bac401d9ae648 # HEAD as of 10.12.2021 +neutron_git_track_branch: master neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas -neutron_vpnaas_git_install_branch: 8b7da9f4fa053d89cb925e3920bb530e213f1e02 # HEAD as of 10.12.2021 -neutron_vpnaas_git_track_branch: stable/xena +neutron_vpnaas_git_install_branch: 883f4f26100f751f50543d363a8a2633f43d62aa # HEAD as of 10.12.2021 +neutron_vpnaas_git_track_branch: master neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing -neutron_dynamic_routing_git_install_branch: 3d5eddd70bccc6fad048afccb35099a1648f804c # HEAD as of 10.12.2021 -neutron_dynamic_routing_git_track_branch: stable/xena +neutron_dynamic_routing_git_install_branch: 8a0ddf6051c81b982187bb062b194284398f5703 # HEAD as of 10.12.2021 +neutron_dynamic_routing_git_track_branch: master # Networking calico follows master networking_calico_git_repo: https://github.com/projectcalico/networking-calico @@ -173,20 +173,20 @@ 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_install_branch: d90a8f3aeac6d6a4477ffbf2ac86c167c2fb7304 # HEAD as of 10.12.2021 -networking_odl_git_track_branch: stable/xena +networking_odl_git_install_branch: b6753dea53ee343830d8c52710fc413ab83a03b8 # HEAD as of 10.12.2021 +networking_odl_git_track_branch: master networking_bgpvpn_git_repo: https://opendev.org/openstack/networking-bgpvpn -networking_bgpvpn_git_install_branch: cc346734ebade079f17b4b58305230ef97e6da4d # HEAD as of 10.12.2021 -networking_bgpvpn_git_track_branch: stable/xena +networking_bgpvpn_git_install_branch: 1789824ec90505d7d67c3b624d318c36b798fb12 # HEAD as of 10.12.2021 +networking_bgpvpn_git_track_branch: master networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc -networking_sfc_git_install_branch: 881a48338d6d82f588a7bc22ac00c546873aa264 # HEAD as of 10.12.2021 -networking_sfc_git_track_branch: stable/xena +networking_sfc_git_install_branch: 5cabef6a858c46a502bd9d9f706b349543ea8a0e # HEAD as of 10.12.2021 +networking_sfc_git_track_branch: master networking_generic_switch_git_repo: https://opendev.org/openstack/networking-generic-switch -networking_generic_switch_git_install_branch: b177c499e05e6c3c388c186ad557e9f3f67d1752 # HEAD as of 10.12.2021 -networking_generic_switch_git_track_branch: stable/xena +networking_generic_switch_git_install_branch: d900b0e1640bfe7135f9196ec48c983509819a14 # HEAD as of 10.12.2021 +networking_generic_switch_git_track_branch: master networking_nsx_git_repo: https://opendev.org/x/vmware-nsx networking_nsx_git_install_branch: 0253265f75f63d5619b30f16a6b64459dec79d82 # HEAD as of 10.12.2021 @@ -198,125 +198,125 @@ networking_nsxlib_git_track_branch: master ## Nova service nova_git_repo: https://opendev.org/openstack/nova -nova_git_install_branch: 7df9379d6661233174d49fb7be8eda0828a5e5ca # HEAD as of 10.12.2021 -nova_git_track_branch: stable/xena +nova_git_install_branch: 755aa11e0c9a59dc1cdb6de5c71f4f9249b37741 # HEAD as of 10.12.2021 +nova_git_track_branch: master ## Sahara service sahara_git_repo: https://opendev.org/openstack/sahara -sahara_git_install_branch: ee79fc7e8f9eb5f23a37e16e4a6483eee72eb818 # HEAD as of 10.12.2021 -sahara_git_track_branch: stable/xena +sahara_git_install_branch: 804ea3776304efa7d9f202b721bd8889ed98cd39 # HEAD as of 10.12.2021 +sahara_git_track_branch: master ## Senlin service senlin_git_repo: https://opendev.org/openstack/senlin -senlin_git_install_branch: 28f8abc29a966d41f8b4502d1fc7432f86b14bea # HEAD as of 10.12.2021 -senlin_git_track_branch: stable/xena +senlin_git_install_branch: cc5f321d2a7624ea4d5c0f0aefac6de3b8a869ee # HEAD as of 10.12.2021 +senlin_git_track_branch: master ## Swift service swift_git_repo: https://opendev.org/openstack/swift -swift_git_install_branch: 8c41bf79b610ae21f4db15d9d118a54d570caf20 # HEAD as of 10.12.2021 -swift_git_track_branch: stable/xena +swift_git_install_branch: 1859f2e161f396023d8328489fb4b88c303797a9 # HEAD as of 10.12.2021 +swift_git_track_branch: master ## Ironic service ironic_git_repo: https://opendev.org/openstack/ironic -ironic_git_install_branch: 561630f8d32a0db6d63a8d9ffd327b6f57bf070e # HEAD as of 10.12.2021 -ironic_git_track_branch: stable/xena +ironic_git_install_branch: cdc3b9538f3e874dc7d76a90b116ecef3a3603c7 # HEAD as of 10.12.2021 +ironic_git_track_branch: master ## Ironic inspector service ironic_inspector_git_repo: https://opendev.org/openstack/ironic-inspector -ironic_inspector_git_install_branch: d2328f0d80aee120d17151dc3b15accf512b46bb # HEAD as of 10.12.2021 -ironic_inspector_git_track_branch: stable/xena +ironic_inspector_git_install_branch: e3f58e4567194318b039c8d154d03ca2c81b8760 # HEAD as of 10.12.2021 +ironic_inspector_git_track_branch: master ## Magnum service magnum_git_repo: https://opendev.org/openstack/magnum -magnum_git_install_branch: 072c5b7a5689dafd6070fe47d0a7366956d8b27e # HEAD as of 10.12.2021 -magnum_git_track_branch: stable/xena +magnum_git_install_branch: fa298eeab19b1d87070d72c7c4fb26cd75b0781e # HEAD as of 10.12.2021 +magnum_git_track_branch: master ## Masakari service masakari_git_repo: https://opendev.org/openstack/masakari -masakari_git_install_branch: 84689df70d66ee13adb30cc6f1b8f795e58aa93b # HEAD as of 10.12.2021 -masakari_git_track_branch: stable/xena +masakari_git_install_branch: 6a15818d62aedc33a69a3058ed19dd9b2da68e5c # HEAD as of 10.12.2021 +masakari_git_track_branch: master ## Masakari monitors services masakari_monitors_git_repo: https://opendev.org/openstack/masakari-monitors -masakari_monitors_git_install_branch: fb7e457c50c9dca6563a0d094026b8e904bebafd # HEAD as of 10.12.2021 -masakari_monitors_git_track_branch: stable/xena +masakari_monitors_git_install_branch: 5198a3c910789cae691d907583a24e055347d736 # HEAD as of 10.12.2021 +masakari_monitors_git_track_branch: master ## Mistral service mistral_git_repo: https://opendev.org/openstack/mistral -mistral_git_install_branch: fe11ac57adab77e459f6fb73689aa8b48395c5e6 # HEAD as of 10.12.2021 -mistral_git_track_branch: stable/xena +mistral_git_install_branch: b2d6de569c7bba96cd3179189ffbcee6b7a28c1f # HEAD as of 10.12.2021 +mistral_git_track_branch: master ## Murano service murano_git_repo: https://opendev.org/openstack/murano -murano_git_install_branch: 7b63349ca05bcb279a79fca6d3878b8f7deade61 # HEAD as of 10.12.2021 -murano_git_track_branch: stable/xena +murano_git_install_branch: 314c85db8addae184a77c8b47217b1f28e4a1b67 # HEAD as of 10.12.2021 +murano_git_track_branch: master murano_dashboard_git_repo: https://opendev.org/openstack/murano-dashboard -murano_dashboard_git_install_branch: 2533ace8f817e1c971329cda398343adf6b30195 # HEAD as of 10.12.2021 -murano_dashboard_git_track_branch: stable/xena +murano_dashboard_git_install_branch: 5e4429a23a442af215db7de084ee8304c375f715 # HEAD as of 10.12.2021 +murano_dashboard_git_track_branch: master ## Trove service trove_git_repo: https://opendev.org/openstack/trove -trove_git_install_branch: f3864fc262121881bd676f832c363b9ae3ea9c2d # HEAD as of 10.12.2021 -trove_git_track_branch: stable/xena +trove_git_install_branch: be86b79119d16ee77f596172f43b0c97cb2617bd # HEAD as of 10.12.2021 +trove_git_track_branch: master ## Horizon Trove dashboard plugin trove_dashboard_git_repo: https://opendev.org/openstack/trove-dashboard -trove_dashboard_git_install_branch: f1c3e51bed9b26688cd7f357e65c3bd06e23e31a # HEAD as of 10.12.2021 -trove_dashboard_git_track_branch: stable/xena +trove_dashboard_git_install_branch: 1602afbd7e3abfab2e40d931726474de5e9e3d70 # HEAD as of 10.12.2021 +trove_dashboard_git_track_branch: master ## Octavia service octavia_git_repo: https://opendev.org/openstack/octavia -octavia_git_install_branch: 4039d35ce221b58490d4aa5b3497e29dbf7664ac # HEAD as of 10.12.2021 -octavia_git_track_branch: stable/xena +octavia_git_install_branch: ab3c3ef73a42b591365e4b19e0cc306b5fb96f9a # HEAD as of 10.12.2021 +octavia_git_track_branch: master ## Placement service placement_git_repo: https://opendev.org/openstack/placement -placement_git_install_branch: 7422ed4d7adb26868602a3f4652119ff0392d298 # HEAD as of 10.12.2021 -placement_git_track_branch: stable/xena +placement_git_install_branch: 6e8c4cbffc05f5696bf3a728a4e73d400185fa20 # HEAD as of 10.12.2021 +placement_git_track_branch: master ## Tacker service tacker_git_repo: https://opendev.org/openstack/tacker -tacker_git_install_branch: 43b19f63078a93b2b7ce717e313993cb51e34a3b # HEAD as of 10.12.2021 -tacker_git_track_branch: stable/xena +tacker_git_install_branch: e501198b0f425cb25817314130e2080e8e1715fd # HEAD as of 10.12.2021 +tacker_git_track_branch: master ## Horizon Octavia dashboard plugin octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard -octavia_dashboard_git_install_branch: 1d594374241efea89c80c91c1b68d2a3fed8dde9 # HEAD as of 10.12.2021 -octavia_dashboard_git_track_branch: stable/xena +octavia_dashboard_git_install_branch: 83267ea0d071a410baf559c049f7f932243579da # HEAD as of 10.12.2021 +octavia_dashboard_git_track_branch: master ## Blazar service blazar_git_repo: https://opendev.org/openstack/blazar -blazar_git_install_branch: 750a4a9cd6570529f83ef79844ca51686c42f72c # HEAD as of 10.12.2021 -blazar_git_track_branch: stable/xena +blazar_git_install_branch: f055bbb5e92919ed2912c5fd40598ef30aedaeb7 # HEAD as of 10.12.2021 +blazar_git_track_branch: master ## Blazar Nova Service blazar_nova_git_repo: https://opendev.org/openstack/blazar-nova -blazar_nova_git_install_branch: 60148cd04b5234c57fa3aa20b38f9ab9e4a1fe60 # HEAD as of 10.12.2021 -blazar_nova_git_track_branch: stable/xena +blazar_nova_git_install_branch: cf659a43d301b1e42166b6f6ec22d87312ce8569 # HEAD as of 10.12.2021 +blazar_nova_git_track_branch: master ## Zun service zun_git_repo: https://opendev.org/openstack/zun -zun_git_install_branch: 3784d99f0cd27a7cf1fd674478b7254d0a35d9e2 # HEAD as of 10.12.2021 -zun_git_track_branch: stable/xena +zun_git_install_branch: 164123eb75facec8820d3c4278403ba11276e1f1 # HEAD as of 10.12.2021 +zun_git_track_branch: master ## Zun kuryr service zun_kuryr_git_repo: https://opendev.org/openstack/kuryr-libnetwork -zun_kuryr_git_install_branch: 757b8c66512bf706892d3ec777cde9afdfed4967 # HEAD as of 10.12.2021 -zun_kuryr_git_track_branch: stable/xena +zun_kuryr_git_install_branch: e5daefc3c2dae2d4f65ef584eb257e841cd417e7 # HEAD as of 10.12.2021 +zun_kuryr_git_track_branch: master ## Zun kuryr library zun_kuryr_lib_git_repo: https://opendev.org/openstack/kuryr -zun_kuryr_lib_git_install_branch: aa74f46f9af23d8b52055d3a8d2dc0cf9b38ce1e # HEAD as of 10.12.2021 -zun_kuryr_lib_git_track_branch: stable/xena +zun_kuryr_lib_git_install_branch: 5b38e84ef8a0a62ee44d53ddd1cda377b0d9d934 # HEAD as of 10.12.2021 +zun_kuryr_lib_git_track_branch: master diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml new file mode 100644 index 0000000000..baab2a94f9 --- /dev/null +++ b/playbooks/defaults/repo_packages/openstack_testing.yml @@ -0,0 +1,21 @@ +--- +# Copyright 2018, Jean-Philippe Evrard +# +# 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. + +# TODO(evrardjp): Remove this file from stable branches to allow the latest tempest +# release to be used instead, when a PyPI published version of tempest contains +# https://github.com/openstack/tempest/commit/7d2b636a30057ed8db8cfd4fe2248f509b3570f1#diff-5c9acbc10dc9d27b47985cd74ab100f6 +tempest_git_repo: https://opendev.org/openstack/tempest +tempest_git_install_branch: 93a902072fd9986f2bb660166552f37d9eb5bdbb # HEAD as of 10.12.2021 +tempest_git_track_branch: master diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml index 11a4bfc5f3..c227a9b532 100644 --- a/playbooks/os-tempest-install.yml +++ b/playbooks/os-tempest-install.yml @@ -25,6 +25,7 @@ user: root vars_files: - "defaults/repo_packages/openstack_services.yml" + - "defaults/repo_packages/openstack_testing.yml" - "defaults/{{ install_method }}_install.yml" pre_tasks: - name: End playbook diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh index 2e8b2bf53c..83689c0511 100755 --- a/scripts/gate-check-commit.sh +++ b/scripts/gate-check-commit.sh @@ -49,7 +49,7 @@ export INSTALL_METHOD=${3:-"source"} # Set the source branch for upgrade tests # Be sure to change this whenever a new stable branch # is created. The checkout must always be N-1. -export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/wallaby'} +export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/xena'} # enable the ARA callback plugin export SETUP_ARA=${SETUP_ARA:-true} diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh index 76c68845d0..a166383567 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 name -export SOURCE_SERIES="wallaby" +export SOURCE_SERIES="xena" # The expected target series name -export TARGET_SERIES="xena" +export TARGET_SERIES="yoga" ## Functions ----------------------------------------------------------------- diff --git a/scripts/upgrade-utilities/deploy-config-changes.yml b/scripts/upgrade-utilities/deploy-config-changes.yml index 858fafebee..52a702b0bf 100644 --- a/scripts/upgrade-utilities/deploy-config-changes.yml +++ b/scripts/upgrade-utilities/deploy-config-changes.yml @@ -75,23 +75,6 @@ tags: - update-secrets - # TODO(jonher): Remove after W cycle - - name: Add Cloudkitty secrets to user_secrets if defined elsewhere - lineinfile: - dest: "{{ openstack_config_dir }}/user_secrets.yml" - regexp: "^{{ item.key }}" - line: "{{ item.key }}: {{ item.value }}" - loop: - - { key: "cloudkitty_container_mysql_password", value: "{{ cloudkitty_container_mysql_password | default([]) }}" } - - { key: "cloudkitty_service_password", value: "{{ cloudkitty_service_password | default([]) }}" } - - { key: "cloudkitty_oslomsg_rpc_password", value: "{{ cloudkitty_oslomsg_rpc_password | default([]) }}" } - - { key: "cloudkitty_oslomsg_notify_password", value: "{{ cloudkitty_oslomsg_notify_password | default([]) }}" } - when: - - item.value - - not (user_secrets.stdout | regex_search('((^|\n)' ~ item.key ~ ')')) - tags: - - update-secrets - - name: Add missing secrets lineinfile: dest: "{{ openstack_config_dir }}/user_secrets.yml" @@ -102,17 +85,6 @@ tags: - update-secrets - # TODO(noonedeadpunk): Remove after W cycle - - name: Define Designate pool id - lineinfile: - dest: "{{ openstack_config_dir }}/user_secrets.yml" - regexp: "^designate_pool_uuid" - line: "designate_pool_uuid: {{ designate_pool_uuid | default('794ccc2c-d751-44fe-b57f-8894c9f5c842') }}" - when: - - not (user_secrets.stdout | regex_search('((^|\n)designate_pool_uuid)')) - tags: - - update-secrets - - name: Generate new secrets shell: "{{ repo_root_dir }}/scripts/pw-token-gen.py --file {{ openstack_config_dir }}/user_secrets.yml" tags: