Merge "Bump SHAs for 2023.1" into stable/2023.1

This commit is contained in:
Zuul 2023-11-24 17:27:03 +00:00 committed by Gerrit Code Review
commit 80f717a1d8
13 changed files with 58 additions and 45 deletions

View File

@ -8,11 +8,11 @@ collections:
- name: openstack.config_template
source: https://opendev.org/openstack/ansible-config_template
type: git
version: 2.0.0
version: 2.1.0
- name: openstack.osa
source: https://opendev.org/openstack/openstack-ansible-plugins
type: git
version: 9463eadf287c3b4f1535ea3540478549544709db
version: 0bb89e9d0bbfe928a96c3ad42f5e3d0f2b637b09
- name: community.general
source: https://github.com/ansible-collections/community.general
type: git

View File

@ -2,9 +2,9 @@
- name: ansible-hardening
scm: git
src: https://opendev.org/openstack/ansible-hardening
version: 42b68b9ff7070f14f896ece1f242a522d1ba9559
version: 3d71c09393f4af27a6afdbf2877c3ad4fd3cac6b
trackbranch: stable/2023.1
shallow_since: '2023-05-23'
shallow_since: '2023-10-25'
- name: apt_package_pinning
scm: git
src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
@ -14,9 +14,9 @@
- name: galera_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-galera_server
version: b5f4e4d737f4a2f8fc6ded3639904b7e429048d9
version: 265722b67ab24344c5f7de5d5781fa80c3d8234a
trackbranch: stable/2023.1
shallow_since: '2023-09-24'
shallow_since: '2023-11-10'
- name: ceph_client
scm: git
src: https://opendev.org/openstack/openstack-ansible-ceph_client
@ -26,9 +26,9 @@
- name: haproxy_server
scm: git
src: https://opendev.org/openstack/openstack-ansible-haproxy_server
version: c5541c93c273d5f6f698f3446ec804d72d52e85d
version: 3da6e55618cfc94d23e78034030aeda02b04eb91
trackbranch: stable/2023.1
shallow_since: '2023-10-09'
shallow_since: '2023-10-29'
- name: keepalived
scm: git
src: https://github.com/evrardjp/ansible-keepalived
@ -64,7 +64,7 @@
src: https://opendev.org/openstack/openstack-ansible-os_keystone
version: 8e7f46b21dfc0fab450e201e2932cfb150496893
trackbranch: stable/2023.1
shallow_since: '2023-10-09'
shallow_since: '2023-10-19'
- name: openstack_openrc
scm: git
src: https://opendev.org/openstack/openstack-ansible-openstack_openrc
@ -122,15 +122,15 @@
- name: os_glance
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_glance
version: 32f729b3674c2de9c5e3adaa9e09f3ac1e6f0c56
version: a5677359abd57731d1004286e520c10b7c86effc
trackbranch: stable/2023.1
shallow_since: '2023-08-22'
shallow_since: '2023-11-08'
- name: os_gnocchi
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_gnocchi
version: 50849989ed3612ebdf10c263f1dfce734b8c2a31
version: c8be8efd9f61ff037e4c9e72bcd832c91d66bc44
trackbranch: stable/2023.1
shallow_since: '2023-08-20'
shallow_since: '2023-10-18'
- name: os_heat
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_heat
@ -146,15 +146,15 @@
- name: os_ironic
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_ironic
version: babc07ed0f4e5ec23f1731e19900c56223fbadae
version: e3efda5d0be10b77db1f4ddf0fc5e600475cdf4e
trackbranch: stable/2023.1
shallow_since: '2023-08-21'
shallow_since: '2023-11-05'
- name: os_magnum
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_magnum
version: b0ec6ece1b1c82e78171f74fdc0401b44297f94e
version: 42796583184ced367598c67cec74a8577688e0fd
trackbranch: stable/2023.1
shallow_since: '2023-08-22'
shallow_since: '2023-11-08'
- name: os_manila
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_manila
@ -188,15 +188,15 @@
- name: os_nova
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_nova
version: f3eeb7a7f8d64583921beafdfc167f2dfeb89161
version: 278f6d3fc46f6c68d74554e1ea91588d0af8620d
trackbranch: stable/2023.1
shallow_since: '2023-10-19'
shallow_since: '2023-11-09'
- name: os_octavia
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_octavia
version: bf442c3993d907e221b4a38ced6e84bb2350822f
version: 978a643dfd8f698baf43a5ba7a58adade4e62e3e
trackbranch: stable/2023.1
shallow_since: '2023-08-22'
shallow_since: '2023-10-22'
- name: os_placement
scm: git
src: https://opendev.org/openstack/openstack-ansible-os_placement
@ -326,7 +326,7 @@
- name: python_venv_build
src: https://opendev.org/openstack/ansible-role-python_venv_build
scm: git
version: ea43f4b7d7805b02d2a41eb9bbb9ea0a33de7a1b
version: 7ca65b91379f2b6e1086e03e33e623968093bac0
trackbranch: stable/2023.1
shallow_since: '2023-10-11'
- name: uwsgi

View File

@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
### HEAD as of 21.10.2023 ###
### HEAD as of 17.11.2023 ###
## Cinder service
cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder"
cinder_git_install_branch: 496d42374625108b3eb0fefba7967bae5f072162
cinder_git_install_branch: 0853f0e6cb6454d24d1acab6ff5dde05c3908e41
cinder_git_track_branch: stable/2023.1

View File

@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
### HEAD as of 21.10.2023 ###
### HEAD as of 17.11.2023 ###
## Cloudkitty service
cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty"
cloudkitty_git_install_branch: 08a22b510c24c6b15436195ebe083494afe98768
cloudkitty_git_install_branch: 8c44864e1dd2c59127dc6f1ea3fd90c0a2f9d687
cloudkitty_git_track_branch: stable/2023.1

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
### HEAD as of 21.10.2023 ###
### HEAD as of 17.11.2023 ###
## Gnocchi service
## This service has a different stable branch strategy to the rest of OpenStack.
@ -22,5 +22,5 @@
# 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: 46afa670b2e57962dc4c7498c2c7b7a818986ac0
gnocchi_git_install_branch: ff96e73da335acb21368c0308fba9750f0dc54f6
gnocchi_git_track_branch: stable/4.4

View File

@ -13,11 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
### HEAD as of 21.10.2023 ###
### HEAD as of 17.11.2023 ###
## Horizon service
horizon_git_repo: "{{ openstack_opendev_base_url }}/openstack/horizon"
horizon_git_install_branch: aacb531610284313035bb0d51bad840a0ebed9b4
horizon_git_install_branch: 5ca2d4082900dc51ae85226d903cb0a397f3e225
horizon_git_track_branch: stable/2023.1
## Adjutant dashboard plugin
@ -72,7 +72,7 @@ sahara_dashboard_git_track_branch: stable/2023.1
## Horizon Trove dashboard plugin
trove_dashboard_git_repo: "{{ openstack_opendev_base_url }}/openstack/trove-dashboard"
trove_dashboard_git_install_branch: aadf4a9ce2ed542e6b68e3c2f212fef9d9948b50
trove_dashboard_git_install_branch: 1e4815e25439a929612148022773dcd54fdf94d7
trove_dashboard_git_track_branch: stable/2023.1
## Horizon Octavia dashboard plugin

View File

@ -13,11 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
### HEAD as of 21.10.2023 ###
### HEAD as of 17.11.2023 ###
## Ironic service
ironic_git_repo: "{{ openstack_opendev_base_url }}/openstack/ironic"
ironic_git_install_branch: 9e90dbed6f15343bdfe07a7a5e1c42bd6bf1f9d0
ironic_git_install_branch: 5379f18fd632bcf1c84c4da0b8869e3e703ae30a
ironic_git_track_branch: stable/2023.1
## Ironic inspector service

View File

@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
### HEAD as of 21.10.2023 ###
### HEAD as of 17.11.2023 ###
## Manila service
manila_git_repo: "{{ openstack_opendev_base_url }}/openstack/manila"
manila_git_install_branch: 6781f22bf1d78b89f500f538244d0991152f8e6d
manila_git_install_branch: 39ff48232146638e34c5e130d96699e1f567662b
manila_git_track_branch: stable/2023.1

View File

@ -13,11 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
### HEAD as of 21.10.2023 ###
### HEAD as of 17.11.2023 ###
## Neutron service
neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron"
neutron_git_install_branch: 60b4c47cf98b547954772abc647748833f91dff4
neutron_git_install_branch: d25fcadcffd6396f76afdf9bc5da251def074986
neutron_git_track_branch: stable/2023.1
neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas"
@ -41,7 +41,7 @@ networking_sfc_git_install_branch: a93b4de04b0f1e34119ab306331b211c0c9dd815
networking_sfc_git_track_branch: stable/2023.1
networking_generic_switch_git_repo: "{{ openstack_opendev_base_url}}/openstack/networking-generic-switch"
networking_generic_switch_git_install_branch: 6dcc83c4bac921cbcfc37ece974287f095611883
networking_generic_switch_git_install_branch: 555725b27080cd8f442700e36ab9d9624153e530
networking_generic_switch_git_track_branch: stable/2023.1
networking_nsx_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsx"

View File

@ -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 21.10.2023 ###
### HEAD as of 17.11.2023 ###
## NOVNC from source
novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC"
novncproxy_git_install_branch: 85a465288b3144e9e42073dacf25dd60fd5665f9
novncproxy_git_install_branch: 7d2dad0f9e96a170281c054a534e4ca5fdbdaa53
novncproxy_git_track_branch: master
## spice-html5 from source
@ -37,5 +37,5 @@ spicehtml5_git_track_branch: master
## Nova service
nova_git_repo: "{{ openstack_opendev_base_url }}/openstack/nova"
nova_git_install_branch: a869ab17c095cbff2c942ab94247b0c30723b230
nova_git_install_branch: cf2abde7ee9437bbd3735d30b9b8e1dcb04a4bda
nova_git_track_branch: stable/2023.1

View File

@ -13,11 +13,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
### HEAD as of 21.10.2023 ###
### HEAD as of 17.11.2023 ###
## Octavia service
octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia"
octavia_git_install_branch: a991569ec57257a9f2018037ac7a6d1a4be12b5d
octavia_git_install_branch: 74499a036bd30c5fb895656c4ae762337ea9172a
octavia_git_track_branch: stable/2023.1
## Octavia OVN provider

View File

@ -13,9 +13,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
### HEAD as of 21.10.2023 ###
### HEAD as of 17.11.2023 ###
## Swift service
swift_git_repo: "{{ openstack_opendev_base_url }}/openstack/swift"
swift_git_install_branch: 195f54ecb5c7520b7ae19157be77047a0f4e68ea
swift_git_install_branch: a52e18e00521a8c9c5cf51a496774cd1c1ee7354
swift_git_track_branch: master

View File

@ -0,0 +1,13 @@
---
upgrade:
- |
Keystone OIDC parameter 'oidc_redirect_uri' is replaced with
'oidc_redirect_path'. This parameter no longer needs to be set explicitly
unless you run additional services which may collide with the default
on the same port as Keystone. Your OIDC provider may need to be updated
to reflect this change in redirect URI which defaults to the Keystone
public URL plus the path /oidc_redirect.
fixes:
- |
Fixed OpenStack command line OIDC integration where Apache mod_auth_openidc
if >= v2.4.9 including on Ubuntu Jammy.