diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml
index 2d29f22b35..2b6235acd6 100644
--- a/ansible-collection-requirements.yml
+++ b/ansible-collection-requirements.yml
@@ -8,7 +8,7 @@ collections:
   version: 1.2.1
   type: git
 - name: https://opendev.org/openstack/openstack-ansible-plugins
-  version: master
+  version: stable/yoga
   type: git
 - name: https://github.com/ansible-collections/community.general
   version: 5.0.0
diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index 45c1227776..f9d2d0acb5 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -2,33 +2,33 @@
 - name: ansible-hardening
   scm: git
   src: https://opendev.org/openstack/ansible-hardening
-  version: 02edef4106227e868942c8fc32709ca5413c97a6
-  trackbranch: master
-  shallow_since: '2022-06-05'
+  version: e2427dc8446bddc722d5d216c3850b751824886b
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: apt_package_pinning
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
-  version: 967cbe4a3e2d181ee139a849dced4227fbc76d95
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 150a5a0bbce8a6379118f52d0a55aa506db50d86
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: galera_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-galera_server
-  version: 8b102ff94b3ea0367a3bf5365295426ee649957b
-  trackbranch: master
-  shallow_since: '2022-06-02'
+  version: af86aaa58d045f4ceebf9762cd7d1507374d4140
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: ceph_client
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-ceph_client
-  version: d9844a4e9421c5324eeed1a4f811681bebf6f565
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 5fe86bfab4307a0b295090951ee5fdddd9bdcba5
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: haproxy_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-haproxy_server
-  version: 8a81b355d8bc0a8828288d7c571639500a4e3e7e
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: be56e3f512dad3d4012c8bfe8457c8cdff40a277
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: keepalived
   scm: git
   src: https://github.com/evrardjp/ansible-keepalived
@@ -38,249 +38,249 @@
 - name: lxc_container_create
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-lxc_container_create
-  version: 37422a7e3dbfff32a1e18c69ca288e593c620727
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: ef9bdcd9981d89348ee3a33fbb1294f5a0688f5b
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: lxc_hosts
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-lxc_hosts
-  version: 844ebcdab63125f239733c2ef1023fade5543e68
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: c59a5d672bd404cb2e26e0e67fa18819dcf278c6
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: memcached_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-memcached_server
-  version: 9847bf2f5901fdaaf95da7cca32e750e8e56e366
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: f6a9f992ddb3c5a3a07df99aa9c4d4f2647d2b3f
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: openstack_hosts
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-openstack_hosts
-  version: 010b8377ed99b88136e495cfc6f0518b983b92da
-  trackbranch: master
-  shallow_since: '2022-06-01'
+  version: 27c40c8a07f04574bf517930828cba7a53f9ff8b
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_keystone
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_keystone
-  version: 235bc0d03721c8efa43e5bc76ec625d80f13b189
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: b7c8ad5171bdce6687447dc5a557f743184cdd47
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: openstack_openrc
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-openstack_openrc
-  version: 688378603315200dee5b29833e3676b951174698
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: a6eb4b24561d6933dad56dbbb8ee3c690ba6aa4b
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_adjutant
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_adjutant
-  version: a5e9acc16dd212663a41fbc184605066e161d8c3
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 826343637a990f9a97cf7cc214a729eeded9bab3
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_aodh
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_aodh
-  version: 1f5f88d80eece34a20b189a1c67f8bbe07382a52
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 1b128b64d21c4345b7088326796fb22b439dc84e
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_barbican
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_barbican
-  version: e5e1a59e05df9f09e21e13d4bec9056b0a93accd
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 6aabfa74d4b766a91306bfaefb32ba1bf10be7fd
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_blazar
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_blazar
-  version: 1a5758969a402916fda7dd2923074d4f8e7edf92
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 15c93ac55ac3515cd5f3ccae55bf357e6034144e
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_ceilometer
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_ceilometer
-  version: ff76357c81211a18569a6dacf36b11d601c57ceb
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 42b854bd165d3d7567d2da2ef5c4dbdddea8366b
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_cinder
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_cinder
-  version: 091b2dfa7246eb94c35816778ee1ae2bcbed5b34
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 9966f1dc532da7ad50f05e8f3eae0d2f3f79319d
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_cloudkitty
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty
-  version: 2d98ac9ec700d286d4ccdf79477e00776d932c44
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: cfbfe75ac034ad787f54680f53e3c68bb3bb8c11
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_designate
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_designate
-  version: 79b0b8e1ee401255f4fd3927abaa1561f0a20e44
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: f216f0850ae2d09ae5329f83abe4fa7919efd007
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_glance
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_glance
-  version: 93c73e99b114346bd1e9100a800ca791e50a02c1
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 9438ed438a2fc4c94b376694555f8db4532bdabb
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_gnocchi
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_gnocchi
-  version: c845819cae0b9606043682008a389716cf3c537a
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: baefb652da46d3c5a18ac03e37e358bb9b8d3a75
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_heat
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_heat
-  version: a69fc500fa3d394ae2d09e22f70429871d582fce
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 0fea9be7f206f9b7982d109fb7cd0e5e86075b70
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_horizon
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_horizon
-  version: 99f8b02ba0052fd111b0ad4f12831203a9b594a3
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 8ab99ba03cbc57aec099e420dce679ddfaa89c42
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_ironic
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_ironic
-  version: 3c71d45c0d88a6c7c3a7089d426ebf57f7667693
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 4c41e649c31d13cfc7a7ada0937c4b2da5f85c1e
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_magnum
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_magnum
-  version: 1a3615afdfe55fea362ffb4103430a2d9ac483f5
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 6b61596954e4912bc9fb03dbcf2e007ecdaba5aa
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_manila
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_manila
-  version: 4bff5b4352370508429675fb0653580ba5e787ba
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 5d1dc3ccc4214ee5d3df5bed9406a7c7f181626d
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_masakari
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_masakari
-  version: abb26f320e56af6a38a676cf1604b4f29762b0ad
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: cade14c092d786a65f37339f6396be9021ddf2e3
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_mistral
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_mistral
-  version: f7fb516d5506837f5e26eb5fa434ffd0d511b466
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 1fa9a9b13f7306151694813d6e5a3c39e4f91d11
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_murano
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_murano
-  version: 6960333d5d5f27eeed4532f795237408696b0563
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 6e491fbbd2f781a2e81ce2f4c6f664f737259de7
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_neutron
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_neutron
-  version: d0af9ee28656e30bd66e364fcb19de422fe6e66e
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: d37795a5b857b0d13bf9faf7881108b14cfd2474
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_nova
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_nova
-  version: cf66cd365c5c4ab7276b8d9a2c11d149f1884eb3
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 906d995f979931b3d5c9007cd35fac7ec4b21f3e
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_octavia
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_octavia
-  version: 2490e5a64eac248ba8d4eb557e1d110e179dda8d
-  trackbranch: master
-  shallow_since: '2022-06-06'
+  version: 7db84c4be469e8ae75458ec5b758b0a265c6c230
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_placement
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_placement
-  version: 025824434be3ee3b551b54f42b3b6b7f2dd9288e
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: e754ce4f76e275b231de51fbea21b58d724037a6
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_rally
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_rally
-  version: 854b8a2b1f35e441cc09fa6b51b8b586351a4a53
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 1a2dcc5ec5e33b730fda75e39d2350b85b89f9fc
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_sahara
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_sahara
-  version: f8ff70e99c02bd1df1045f0f794ffc2de6fa2648
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: f6594f3ca5cd6ca81079c16c95d61c9224cf493e
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_senlin
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_senlin
-  version: f9cb1f0953c0544988211d551a8913923e707c2d
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 8640e37b4beabb2cb201ff586c36faeb6012a109
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_swift
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_swift
-  version: e2e110154939a8a7170e07aec3a24ad64d0b3403
-  trackbranch: master
-  shallow_since: '2022-06-03'
+  version: 4eaf78afd418a28ac6b0eb953274940ef0a8cc85
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_tacker
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_tacker
-  version: d3794939f010941ef4c616155a03ef978e8e5eb7
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 850a7a114a786f856be8428c257195817c0ba6ff
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_tempest
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_tempest
-  version: 18f2c885da785dd00380ebfb8407702c942c6731
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 971e2f1cfd53e7ca0b3d959a8664b5bd1ca8edbf
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_trove
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_trove
-  version: 6dff6afa76649247cd412558a64a4455b4a1e112
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 70795724bc370525199d4b5552a562cd59a95d8b
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: os_zun
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_zun
-  version: 9825b2cfe94e8a3d6b5c108f2426489c453dcf91
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: d047be44553863e2be8b8ebe44a324727c4e2e69
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: qdrouterd
   scm: git
   src: https://opendev.org/openstack/ansible-role-qdrouterd
-  version: 59786da1bb1769ee7176a5f53a2e777f9f1d0747
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: d39dd86cb07a1a5bd8b233fa2e9e3a171796d599
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: rabbitmq_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server
-  version: 30f338e4bcd2e693dc4ecb5dc1d1509982440e52
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 3b64a1ebe8caa271edd9a74bb629ade00af7135b
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: repo_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-repo_server
-  version: a9ecec103d0f823123baf429a4c9dd1361003096
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: a1acb5120afca0ee6b91ea8b72aa7dc87dee5f09
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: rsyslog_client
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-rsyslog_client
-  version: 8b3426e27d6d2f40811ef6c701ce63325a11a053
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: a37aee7556de5d3761e09e3a871edbef881b58d7
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: rsyslog_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-rsyslog_server
-  version: e6fea6f8eac588d4d1ef60df888e52f933d3caa7
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 8688d02e1fcedf8a5549bdd1263e1201b5c6b9cc
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: bird
   scm: git
   src: https://github.com/logan2211/ansible-bird
@@ -308,9 +308,9 @@
 - name: ceph-ansible
   scm: git
   src: https://github.com/ceph/ceph-ansible
-  version: 4d3e25c85ee390a126ddc755dc3f672c298ff4fa
+  version: 941102d4e643bdcc5531bbe462e88558fb37206b
   trackbranch: stable-6.0
-  shallow_since: '2022-05-29'
+  shallow_since: '2022-06-14'
 - name: opendaylight
   scm: git
   src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
@@ -322,40 +322,40 @@
   src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync
   version: dacff1ed6ede207b8afcbfff5e990d875580893b
   trackbranch: master
-  shallow_since: '2021-01-12'
+  shallow_since: '2022-06-14'
 - name: systemd_service
   src: https://opendev.org/openstack/ansible-role-systemd_service
   scm: git
-  version: 4bc059e9d93fc80f225564955db410de6463262e
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 339c4edc005b4a0cefe6fc3a310db5fba331910b
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: systemd_mount
   src: https://opendev.org/openstack/ansible-role-systemd_mount
   scm: git
-  version: 076b8f940e88eec34fb2a4b7a05fd9fea8ee7b3b
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 3129df4e5dd87bbcdb2201276485ce78e56ad5ed
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: systemd_networkd
   src: https://opendev.org/openstack/ansible-role-systemd_networkd
   scm: git
-  version: 1906bd37ec78d1bb9ab4496467dfc2afe0875973
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 999de0a3fd6dc0905a00da1ec222745befa22c43
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: python_venv_build
   src: https://opendev.org/openstack/ansible-role-python_venv_build
   scm: git
-  version: 04f58473495eb3127ffd2486ae993355269c9905
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 6e86a29007adacec639527cd949132c58583a6f7
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: uwsgi
   src: https://opendev.org/openstack/ansible-role-uwsgi
   scm: git
-  version: d30b01f30f7cf90748bd664c1f1c150b27fe1fc3
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: b8bf27b1d21c4157aefe9b60be694bb5e8225e31
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
 - name: pki
   src: https://opendev.org/openstack/ansible-role-pki
   scm: git
-  version: 39a320161a58b3fc852a3e656b803886d7f2f79a
-  trackbranch: master
-  shallow_since: '2022-05-29'
+  version: 92cf6117b5c54c53ecad1da290ccf71e9b273969
+  trackbranch: stable/yoga
+  shallow_since: '2022-06-19'
diff --git a/doc/source/index.rst b/doc/source/index.rst
index c2ff7c9139..a3f894d6be 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -13,7 +13,7 @@ Documentation for each of the following releases is available.
 Yoga: Under Development
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-OpenStack-Ansible Yoga is currently in development.
+OpenStack-Ansible Yoga is currently in Release Candidate.
 
 .. toctree::
    :maxdepth: 1
diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml
index 5321066141..b0953af630 100644
--- a/playbooks/defaults/repo_packages/gnocchi.yml
+++ b/playbooks/defaults/repo_packages/gnocchi.yml
@@ -29,11 +29,11 @@
 ### or have a comment / reason attached to them as to why a tag can not work.
 
 
-### HEAD as of 27.05.2022 ###
+### HEAD as of 20.06.2022 ###
 
 ## Gnocchi service
 ## This service has a different stable branch strategy to the rest of OpenStack.
 ## The SHA is recorded here to make the SHA updating easier.
 gnocchi_git_repo: https://github.com/gnocchixyz/gnocchi
-gnocchi_git_install_branch: 859a2574f93b3bcf5fe5b937397f23cde07a9e52
+gnocchi_git_install_branch: a46f0d490ab13faf7128ac1101ce845666954816
 gnocchi_git_track_branch: stable/4.4
diff --git a/playbooks/defaults/repo_packages/nova_consoles.yml b/playbooks/defaults/repo_packages/nova_consoles.yml
index 6708adb184..154819d6ab 100644
--- a/playbooks/defaults/repo_packages/nova_consoles.yml
+++ b/playbooks/defaults/repo_packages/nova_consoles.yml
@@ -24,7 +24,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 27.05.2022 ###
+### HEAD as of 20.06.2022 ###
 
 ## NOVNC from source
 novncproxy_git_repo: https://github.com/novnc/noVNC
diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml
index 6da67fb7b1..96a56b51c7 100644
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@@ -28,11 +28,11 @@
 ### Before this is shipped all of these services should have a tag set as the branch,
 ### or have a comment / reason attached to them as to why a tag can not work.
 
-### HEAD as of 27.05.2022 ###
+### HEAD as of 20.06.2022 ###
 
 ## Global Requirements
 requirements_git_repo: https://opendev.org/openstack/requirements
-requirements_git_install_branch: 952b2234a3d9ef94482892948bdb1fb836d2ab36
+requirements_git_install_branch: 5228a6045ccb57150016c9303359d89207a28334
 requirements_git_track_branch: stable/yoga
 
 ## Adjutant service
@@ -47,13 +47,13 @@ adjutant_dashboard_git_track_branch: stable/yoga
 
 ## Aodh service
 aodh_git_repo: https://opendev.org/openstack/aodh
-aodh_git_install_branch: 9ea4631b4dd9a7b4ce3f7531ec687cdcdc7c37e4
+aodh_git_install_branch: 539145cce1cbb1a862f135518f8b316a3fd0002a
 aodh_git_track_branch: stable/yoga
 
 
 ## Barbican service
 barbican_git_repo: https://opendev.org/openstack/barbican
-barbican_git_install_branch: 2063705e1f86b112aadabdfedca9807635a25dc1
+barbican_git_install_branch: 29e8fd054dbee79be2403e81fbe864aef8773ffe
 barbican_git_track_branch: stable/yoga
 
 
@@ -71,7 +71,7 @@ ceilometer_git_track_branch: stable/yoga
 
 ## Cinder service
 cinder_git_repo: https://opendev.org/openstack/cinder
-cinder_git_install_branch: 753c0224631e218c860e48722520e9ad384ca2f4
+cinder_git_install_branch: f728548f3faad3c7278dc3d4d137a6265db17677
 cinder_git_track_branch: stable/yoga
 
 
@@ -89,7 +89,7 @@ cloudkitty_dashboard_git_track_branch: stable/yoga
 
 ## Designate service
 designate_git_repo: https://opendev.org/openstack/designate
-designate_git_install_branch: 8f5e8db10082b83e1667e4e06f4c1f2a4a80d142
+designate_git_install_branch: 3808102790ca8ccb559c865ddea15876b5a19939
 designate_git_track_branch: stable/yoga
 
 
@@ -101,13 +101,13 @@ designate_dashboard_git_track_branch: stable/yoga
 
 ## Glance service
 glance_git_repo: https://opendev.org/openstack/glance
-glance_git_install_branch: efff2363e9bb22e4f32757dd278a70d0a9ed882e
+glance_git_install_branch: 1964876644c7086eff516832a19206d28891110d
 glance_git_track_branch: stable/yoga
 
 
 ## Heat service
 heat_git_repo: https://opendev.org/openstack/heat
-heat_git_install_branch: abea5a452a32ae6cf34066649bd2e058d96ba212
+heat_git_install_branch: b3cefb392c52cb1fe2c832ffed4cc117bad1e070
 heat_git_track_branch: stable/yoga
 
 ## Horizon Heat dashboard plugin
@@ -156,7 +156,7 @@ manila_git_track_branch: stable/yoga
 
 ## Neutron service
 neutron_git_repo: https://opendev.org/openstack/neutron
-neutron_git_install_branch: e2a2cc243f1c103dd3643592ec04ca9635774a4d
+neutron_git_install_branch: f6e47be8d10e58e6db4a40d9115eb4c8e54e01fe
 neutron_git_track_branch: stable/yoga
 
 neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas
@@ -194,12 +194,12 @@ networking_nsx_git_install_branch: 0253265f75f63d5619b30f16a6b64459dec79d82
 networking_nsx_git_track_branch: master
 
 networking_nsxlib_git_repo: https://opendev.org/x/vmware-nsxlib
-networking_nsxlib_git_install_branch: d761feadd7b572ed5e0c788f0ffe7e9f245e71c8
+networking_nsxlib_git_install_branch: d915f2fecbc0e629b67873d4923c4aba9f0bcdcc
 networking_nsxlib_git_track_branch: master
 
 ## Nova service
 nova_git_repo: https://opendev.org/openstack/nova
-nova_git_install_branch: 52f4e37f6a5ff15576c4ff2a9ca203651798db10
+nova_git_install_branch: 6b9c55ac5d3399a444efd38e055ee91f7b70c3d4
 nova_git_track_branch: stable/yoga
 
 
@@ -223,7 +223,7 @@ swift_git_track_branch: stable/yoga
 
 ## Ironic service
 ironic_git_repo: https://opendev.org/openstack/ironic
-ironic_git_install_branch: ee0b32933f724932cb21e5ca860aaa7544e85d6b
+ironic_git_install_branch: d035a8fd0219350ad64c1449eaef4eb621eb3b29
 ironic_git_track_branch: stable/yoga
 
 
@@ -279,7 +279,7 @@ trove_dashboard_git_track_branch: stable/yoga
 
 ## Octavia service
 octavia_git_repo: https://opendev.org/openstack/octavia
-octavia_git_install_branch: b707808cad5783c58e2a2d6613fd9eec3dc3298f
+octavia_git_install_branch: a237182303d6a5559ea1148310a6d8fb18c6cbd3
 octavia_git_track_branch: stable/yoga
 
 
diff --git a/releasenotes/notes/gnocchi_metricd_workers-e179af4e37d1531d.yaml b/releasenotes/notes/gnocchi_metricd_workers-e179af4e37d1531d.yaml
new file mode 100644
index 0000000000..ac04ac1601
--- /dev/null
+++ b/releasenotes/notes/gnocchi_metricd_workers-e179af4e37d1531d.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Implemented variable ``gnocchi_metricd_workers`` that is designed to
+    controll amount of gnocchi-metricd workers spawned. By default it is
+    equal to number of CPU cores, but no more than 16 workers.
+
diff --git a/releasenotes/notes/haproxy_tuning_params_released-45eb40104747561a.yaml b/releasenotes/notes/haproxy_tuning_params_released-45eb40104747561a.yaml
new file mode 100644
index 0000000000..7ca0ddfa7d
--- /dev/null
+++ b/releasenotes/notes/haproxy_tuning_params_released-45eb40104747561a.yaml
@@ -0,0 +1,20 @@
+---
+upgrade:
+  - |
+    If you have defined ``haproxy_tuning_params`` in your deployment, make sure
+    that before upgrade all keys are valid haproxy options. For example,
+    instead of ``chksize: 16384`` you should set ``tune.chksize: 16384``.
+    Otherwise invalid config will be generated and haproxy will fail on
+    startup.
+    No upgrade scripts are provided for this change as well as no backwards
+    compatability.
+other:
+  - |
+    Restriction on parameters that can be passed to ``haproxy_tuning_params``
+    has been released. This means, that any tuning parameter can be passed in
+    key/value format.
+fixes:
+  - |
+    By default we increase ``tune.maxrewrite`` as otherwise while using CSP
+    headers, their size could exceed allowed buffer.
+    Also deployers can override this value if needed.
diff --git a/releasenotes/notes/magnum_conductor_workers-3f7eafeb4429dd0b.yaml b/releasenotes/notes/magnum_conductor_workers-3f7eafeb4429dd0b.yaml
new file mode 100644
index 0000000000..45833b9a9d
--- /dev/null
+++ b/releasenotes/notes/magnum_conductor_workers-3f7eafeb4429dd0b.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Implemented variable ``magnum_conductor_workers`` that is designed to
+    controll amount of magnum-conductor workers spawned. By default it is
+    equal to number of CPU cores, but no more then 16 workers.
diff --git a/releasenotes/notes/neutron-vpnaas-custom-config-ad991bb02b9ed655.yaml b/releasenotes/notes/neutron-vpnaas-custom-config-ad991bb02b9ed655.yaml
new file mode 100644
index 0000000000..c8ea98c4a2
--- /dev/null
+++ b/releasenotes/notes/neutron-vpnaas-custom-config-ad991bb02b9ed655.yaml
@@ -0,0 +1,33 @@
+---
+features:
+  - |
+    Neutron VPN as a Service (VPNaaS) with customized configuration files
+    can now be defined with the variable ``neutron_vpnaas_custom_config``.
+    deployers should define ``neutron_vpnaas_custom_config`` in 'user_variables.yml'.
+    Example:
+
+    .. code-block:: yaml
+
+      neutron_vpnaas_custom_config:
+        - src: "/etc/openstack_deploy/strongswan/strongswan.conf.template"
+          dest: "{{ neutron_conf_dir }}/strongswan.conf.template"
+        - src: "/etc/openstack_deploy/strongswan/strongswan.d"
+          dest: "/etc/strongswan.d"
+        - src: "/etc/openstack_deploy/{{ neutron_vpnaas_distro_packages }}/ipsec.conf.template"
+          dest: "{{ neutron_conf_dir }}/ipsec.conf.template"
+        - src: "/etc/openstack_deploy/{{ neutron_vpnaas_distro_packages }}/ipsec.secret.template"
+          dest: "{{ neutron_conf_dir }}/ipsec.secret.template"
+
+    We should be also define ``neutron_l3_agent_ini_overrides`` in 'user_variables.yml'
+    to tell ``l3_agent`` use the new config file.
+    Example:
+
+    .. code-block:: yaml
+
+      neutron_l3_agent_ini_overrides:
+        ipsec:
+          enable_detailed_logging: True
+        strongswan:
+          strongswan_config_template : "{{ neutron_conf_dir }}/strongswan.conf.template"
+        openswan:
+          ipsec_config_template:  "{{ neutron_conf_dir }}/ipsec.conf.template"
diff --git a/releasenotes/notes/remove_cinderv2_api-a9e848a63c055bb2.yaml b/releasenotes/notes/remove_cinderv2_api-a9e848a63c055bb2.yaml
new file mode 100644
index 0000000000..ab92092a6c
--- /dev/null
+++ b/releasenotes/notes/remove_cinderv2_api-a9e848a63c055bb2.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Cinder v2 API is now fully removed from Cinder service.
+    With that os_cinder role ensures v2 endpoint is not present anymore in
+    the catalog and remove endpoints if they're present.