Bump SHAs for stable/2023.1

Closes-Bug: #2025513 Closes-Bug: #2024407 Change-Id: I87a5c85d42aa757f9789a81974403284c2d32051
openstack · Jul 6, 2023 · 9921c23 · 9921c23
1 parent 6c0d537
commit 9921c23
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 44 deletions.
diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml
@@ -12,7 +12,7 @@ collections:
 - name: openstack.osa
   source: https://opendev.org/openstack/openstack-ansible-plugins
   type: git
-  version: 5c8de0eb2c8b907f24bf1251b83d55457f91ea36
+  version: e6ce7a42e1282d3b80f422feacf32f6301bbc6b1
 - name: community.general
   source: https://github.com/ansible-collections/community.general
   type: git

diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
@@ -20,9 +20,9 @@
 - name: ceph_client
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-ceph_client
-  version: fc1cce881722dad32b6eed452ca22e5a4aa273eb
+  version: 3bc73a8ab6d33fbee81aefb13b25b67e0ca42324
   trackbranch: stable/2023.1
-  shallow_since: '2023-05-23'
+  shallow_since: '2023-06-26'
 - name: haproxy_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-haproxy_server
@@ -104,9 +104,9 @@
 - name: os_cinder
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_cinder
-  version: 251778639170c8b7fef733a6ee3021c7bf6bdc85
+  version: 8f329dc21cb67c1647e03f45fa79c50d6feff5bb
   trackbranch: stable/2023.1
-  shallow_since: '2023-05-23'
+  shallow_since: '2023-06-26'
 - name: os_cloudkitty
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty
@@ -254,9 +254,9 @@
 - name: qdrouterd
   scm: git
   src: https://opendev.org/openstack/ansible-role-qdrouterd
-  version: master
-  trackbranch: master
-  shallow_since: '2022-12-12'
+  version: f9ee8629a3cb39500e5baf4f2384a4c5e0fc16ff
+  trackbranch: stable/2023.1
+  shallow_since: '2023-05-23'
 - name: rabbitmq_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server
@@ -272,39 +272,39 @@
 - name: etcd
   scm: git
   src: https://github.com/noonedeadpunk/ansible-etcd
-  version: master
+  version: de3b061e954d3259e0a48e2e55878f598ef3a9c1
   trackbranch: master
-  shallow_since: '2022-05-27'
+  shallow_since: '2023-04-11'
 - name: unbound
   scm: git
   src: https://github.com/noonedeadpunk/ansible-role-unbound
-  version: master
+  version: 26abb238925dec80707ef7e4b869b3c5e48d4f7b
   trackbranch: master
-  shallow_since: '2022-05-27'
+  shallow_since: '2023-02-09'
 - name: resolvconf
   scm: git
   src: https://github.com/logan2211/ansible-resolvconf
-  version: master
+  version: f7f694b3dd4361e364dccb4ce94e6510727fca2f
   trackbranch: master
   shallow_since: '2021-03-31'
 - name: ceph-ansible
   scm: git
   src: https://github.com/ceph/ceph-ansible
-  version: stable-7.0
+  version: 91c57b662df0618f9227edfb342bff278e323cc5
   trackbranch: stable-7.0
-  shallow_since: '2022-06-14'
+  shallow_since: '2023-06-28'
 - name: opendaylight
   scm: git
   src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
-  version: master
+  version: 4a9217ed0fe9078152435daaa2d3f45b81021b3a
   trackbranch: master
   shallow_since: '2019-09-14'
 - name: pacemaker_corosync
   scm: git
   src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync
-  version: master
+  version: c4a492a248c89c0710489a0f0cd0f95546e6be26
   trackbranch: master
-  shallow_since: '2022-06-14'
+  shallow_since: '2023-04-10'
 - name: systemd_service
   src: https://opendev.org/openstack/ansible-role-systemd_service
   scm: git

diff --git 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 03.07.2023 ###
 
 ## Global Requirements
 requirements_git_repo: "{{ openstack_opendev_base_url }}/openstack/requirements"
-requirements_git_install_branch: 92e17ec0794879e010ed4ba754b5ee1246bfe917
+requirements_git_install_branch: d450d25d953cc53e902f83c6a0123efa2536faeb
 requirements_git_track_branch: stable/2023.1
diff --git 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 03.07.2023 ###
 
 ## Cinder service
 cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder"
-cinder_git_install_branch: 1ae052c976ba3a3edb57f3ecd1ce0580305bd03f
+cinder_git_install_branch: f542dd07b07162f39325a83fae67cda166e36798
 cinder_git_track_branch: stable/2023.1
diff --git 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 03.07.2023 ###
 
 ## Designate service
 designate_git_repo: "{{ openstack_opendev_base_url }}/openstack/designate"
-designate_git_install_branch: 38b100a6fb775ab5f1b566294b2c2d72f889300f
+designate_git_install_branch: e742851dc9ce7bef3cfab877e20a9873f84fdb5f
 designate_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/gnocchi_all/source_git.yml b/inventory/group_vars/gnocchi_all/source_git.yml
@@ -18,6 +18,9 @@
 ## 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.
+
+# NOTE: Gnocchi should not be bumped until https://github.com/gnocchixyz/gnocchi/pull/1305
+#       is merged and backported
 gnocchi_git_repo: "{{ openstack_github_base_url }}/gnocchixyz/gnocchi"
-gnocchi_git_install_branch: 60c2b5631581264758a1857812b9d6035bce7883
+gnocchi_git_install_branch: 6f35ea5413a9f78551d8193b8d2a6d77c49b6372 
 gnocchi_git_track_branch: stable/4.4
diff --git a/inventory/group_vars/horizon_all/source_git.yml b/inventory/group_vars/horizon_all/source_git.yml
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 30.05.2023 ###
+### HEAD as of 03.07.2023 ###
 
 ## Horizon service
 horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon"
-horizon_git_install_branch: cbbc7d362167dd8804990d2dd24b55c8dec8df4b
+horizon_git_install_branch: 3ea69c8906062c503157d47d5cd0fdda68b733a8
 horizon_git_track_branch: stable/2023.1
 
 ## Adjutant dashboard plugin
@@ -27,7 +27,7 @@ adjutant_dashboard_git_track_branch: stable/2023.1
 
 ## Barbican dashboard plugin
 barbican_dashboard_git_repo: "{{ openstack_opendev_base_url }}//openstack/barbican-ui"
-barbican_dashboard_git_install_branch: 3a78a743426376250f43508d4281e86c75067271
+barbican_dashboard_git_install_branch: 7e88ff2ace570b3899ae0c5526a9cfa8aef0b45e
 barbican_dashboard_git_track_branch: master
 
 ## Cloudkitty dashboard plugin

diff --git a/inventory/group_vars/ironic_all/source_git.yml b/inventory/group_vars/ironic_all/source_git.yml
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 30.05.2023 ###
+### HEAD as of 03.07.2023 ###
 
 ## Ironic service
 ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic"
-ironic_git_install_branch: d72eb004ed48dc71b6dfe54a1a2cbbbae813de01
+ironic_git_install_branch: 7bb46729bdb30e3dce9e03e0a7db9952ec270874
 ironic_git_track_branch: stable/2023.1
 
 ## Ironic inspector service

diff --git 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 03.07.2023 ###
 
 ## Magnum service
 magnum_git_repo: "{{ openstack_opendev_base_url }}/openstack/magnum"
-magnum_git_install_branch: a4d8145f8871e1da6885e6cea4f9cb3c41767434
+magnum_git_install_branch: f2910697deae132eae48b85de174f180c279ca18
 magnum_git_track_branch: stable/2023.1
diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 30.05.2023 ###
+### HEAD as of 03.07.2023 ###
 
 ## Neutron service
 neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron"
-neutron_git_install_branch: 6d9f481d875310a5184660a86388213f0f86dbb6
+neutron_git_install_branch: 9060971b73b406fb0125254ee389878a2e5129e7
 neutron_git_track_branch: stable/2023.1
 
 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas"
@@ -29,7 +29,7 @@ neutron_dynamic_routing_git_install_branch: 13e0d8a63dbdbd9e1a863144999794d4fc9a
 neutron_dynamic_routing_git_track_branch: stable/2023.1
 
 networking_odl_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-odl"
-networking_odl_git_install_branch: 48936559c71606d5e43fba1ad4382d74110e7d01
+networking_odl_git_install_branch: 404db086fccf450f8e485301c8ddfe4191581299
 networking_odl_git_track_branch: stable/2023.1
 
 networking_bgpvpn_git_repo: "{{ openstack_opendev_base_url }}/openstack/networking-bgpvpn"

diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml
@@ -23,11 +23,11 @@
 ##   * 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 03.07.2023 ###
 
 ## NOVNC from source
 novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC"
-novncproxy_git_install_branch: c2d6a06d6df7dcc5cda9567181c685cd1b84d750
+novncproxy_git_install_branch: ca6527c1bf7131adccfdcc5028964a1e67f9018c
 novncproxy_git_track_branch: master
 
 ## spice-html5 from source

diff --git 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 03.07.2023 ###
 
 ## Octavia service
 octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia"
-octavia_git_install_branch: 920dbfa5ad7d529ba0ee6ae2162fb73ddfc8ec13
+octavia_git_install_branch: 34d95db1332dea340ec1ca492cca71cdda53d7c2
 octavia_git_track_branch: stable/2023.1
 
 ## 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_install_branch: 217d1ab4317b886ef3544c029819121c91f0709f
 octavia_ovn_octavia_provider_git_track_branch: stable/2023.1
diff --git 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 03.07.2023 ###
 
 ## Swift service
 swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift"
-swift_git_install_branch: 149b617c28514c36d1dec57232cce883375f1dbb
+swift_git_install_branch: a82d9c58b6035dc3a69d4274919084d6ec6950c7
 swift_git_track_branch: master
diff --git 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 03.07.2023 ###
 
 ## Trove service
 trove_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove"
-trove_git_install_branch: fee50052d1b9e9800406aa1037aef3cb04c8fbba
+trove_git_install_branch: 8c47360daa23ee45ac975f88d2ba93c2460136b2
 trove_git_track_branch: stable/2023.1