Skip to content

Commit d288f2e

Browse files
authored
Merge branch 'stackhpc/yoga' into yoga-octavia-bump
2 parents 87346e7 + aa45730 commit d288f2e

File tree

4 files changed

+16
-19
lines changed

4 files changed

+16
-19
lines changed

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ kolla_enable_etcd: true
1818
kolla_enable_grafana: true
1919
kolla_enable_influxdb: true
2020
kolla_enable_ironic: true
21+
kolla_enable_kibana: "{{ kolla_base_distro not in ['rocky'] }}"
2122
kolla_enable_magnum: true
2223
kolla_enable_manila: true
2324
kolla_enable_mariabackup: true

etc/kayobe/kolla/globals.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,49 +17,37 @@ kayobe_image_tags:
1717
openstack:
1818
centos: yoga-20230905T130221
1919
rocky: yoga-20230310T170929
20-
ubuntu: yoga-20230220T181235
20+
ubuntu: yoga-20230913T160015
2121
bifrost:
2222
rocky: yoga-20230310T194732
23-
ubuntu: yoga-20230220T184947
2423
blazar:
2524
rocky: yoga-20230315T130918
26-
ubuntu: yoga-20230315T125441
2725
caso:
2826
rocky: yoga-20230315T130918
29-
ubuntu: yoga-20230315T125441
3027
grafana:
3128
rocky: yoga-20230419T111514
32-
ubuntu: yoga-20230426T084340
3329
ironic:
3430
rocky: yoga-20230316T170311
35-
ubuntu: yoga-20230316T154704
3631
ironic_dnsmasq:
3732
rocky: yoga-20230310T170929
38-
ubuntu: yoga-20230220T181235
3933
kibana:
4034
centos: yoga-20230907T152300
4135
magnum:
4236
rocky: yoga-20230825T142202
43-
ubuntu: yoga-20230825T142202
4437
neutron:
4538
rocky: yoga-20230728T081242
46-
ubuntu: yoga-20230728T081242
4739
nova:
4840
rocky: yoga-20230718T112646
49-
ubuntu: yoga-20230718T112646
5041
nova_libvirt:
5142
# Live-migration is broken from qemu-kvm-6.2.0-20.module_el8.7.0+1218+f626c2ff to qemu-kvm-6.2.0-39.module_el8+669+76cc32af
5243
# with signature: `Missing section footer for 0000:00:01.3/piix4_pm`. Test carefully before bumping.
5344
centos: yoga-20230718T112646
5445
openvswitch:
5546
rocky: yoga-20230515T150233
56-
ubuntu: yoga-20230515T150233
5747
ovn:
5848
rocky: yoga-20230515T150233
59-
ubuntu: yoga-20230515T150233
6049
prometheus_node_exporter:
6150
rocky: yoga-20230315T170614
62-
ubuntu: yoga-20230315T170541
6351

6452
bifrost_tag: "{% raw %}{{ kayobe_image_tags['bifrost'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"
6553
blazar_tag: "{% raw %}{{ kayobe_image_tags['blazar'][kolla_base_distro] | default(openstack_tag) }}{% endraw %}"

etc/kayobe/pulp-repo-versions.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20230510T072502
1616
stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20230310T163106
1717
stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230301T034123
1818
stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20230308T155704
19-
stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230811T005529
19+
stackhpc_pulp_repo_docker_ce_ubuntu_version: 20230908T013529
2020
stackhpc_pulp_repo_docker_version: 20230801T003759
2121
stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20230727T144020
2222
stackhpc_pulp_repo_epel_9_version: 20230302T031902
@@ -51,8 +51,8 @@ stackhpc_pulp_repo_rocky_9_2_crb_version: 20230825T131407
5151
stackhpc_pulp_repo_rocky_9_2_extras_version: 20230825T131407
5252
stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20230805T012805
5353
stackhpc_pulp_repo_treasuredata_4_version: 20230903T003752
54-
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20230811T105337
55-
stackhpc_pulp_repo_ubuntu_focal_security_version: 20230825T083004
56-
stackhpc_pulp_repo_ubuntu_focal_version: 20230825T083004
57-
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20230811T044829
58-
stackhpc_pulp_repo_ubuntu_jammy_version: 20230811T044829
54+
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20230908T112533
55+
stackhpc_pulp_repo_ubuntu_focal_security_version: 20230908T101641
56+
stackhpc_pulp_repo_ubuntu_focal_version: 20230908T101641
57+
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20230908T053616
58+
stackhpc_pulp_repo_ubuntu_jammy_version: 20230908T053616
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
security:
3+
- |
4+
Bumps Ubuntu repository snapshots and container images to bring in latest
5+
security patches. This includes the microcode to patch Inception
6+
(CVE-2023-20569) and Downfall (CVE-2022-40982). Zenbleed (CVE-2023-20593)
7+
was patched in the previous snapshot bump. To apply the microcode updates,
8+
it is recommended to reboot each host after upgrading all of the packages.

0 commit comments

Comments
 (0)