Skip to content

Commit 698470a

Browse files
committed
Merge remote-tracking branch 'origin/stackhpc/yoga' into yoga-infiniband
2 parents 2559f55 + 928f96c commit 698470a

File tree

6 files changed

+77
-1
lines changed

6 files changed

+77
-1
lines changed

.github/workflows/stackhpc-all-in-one.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
os_distribution:
1515
description: Host OS distribution
1616
type: string
17-
default: rocky
17+
default: centos
1818
os_release:
1919
description: Host OS release
2020
type: string
@@ -234,6 +234,21 @@ jobs:
234234
run: |
235235
docker image pull $KAYOBE_IMAGE
236236
237+
# NOTE: Boostrap release train repos before growroot due to missing
238+
# upstream CS8 repos preventing installation of growroot package.
239+
- name: Host configure
240+
run: |
241+
docker run -t --rm \
242+
-v $(pwd):/stack/kayobe-automation-env/src/kayobe-config \
243+
-e KAYOBE_ENVIRONMENT -e KAYOBE_VAULT_PASSWORD -e KAYOBE_AUTOMATION_SSH_PRIVATE_KEY -e KAYOBE_TAGS -e KOLLA_TAGS \
244+
$KAYOBE_IMAGE \
245+
/stack/kayobe-automation-env/src/kayobe-config/.automation/pipeline/overcloud-host-configure.sh
246+
env:
247+
KAYOBE_AUTOMATION_SSH_PRIVATE_KEY: ${{ steps.ssh_key.outputs.ssh_key }}
248+
KAYOBE_TAGS: "ssh-known-host,kayobe-ansible-user,kayobe-target-venv,dnf,kolla-ansible-user,kolla-pip,kolla-target-venv"
249+
KOLLA_TAGS: "none"
250+
if: inputs.os_distribution == 'centos' && inputs.os_release == '8-stream'
251+
237252
- name: Run growroot
238253
run: |
239254
docker run -t --rm \

.github/workflows/stackhpc-pull-request.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,34 @@ jobs:
7676
if: ${{ needs.check-changes.outputs.aio == 'true' }}
7777
if: github.repository == 'stackhpc/stackhpc-kayobe-config'
7878

79+
all-in-one-centos-ovs:
80+
name: aio (CentOS OVS)
81+
needs:
82+
- check-changes
83+
- build-kayobe-image
84+
uses: ./.github/workflows/stackhpc-all-in-one.yml
85+
with:
86+
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
87+
neutron_plugin: ovs
88+
OS_CLOUD: openstack
89+
if: ${{ needs.check-changes.outputs.aio == 'true' }}
90+
secrets: inherit
91+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
92+
93+
all-in-one-centos-ovn:
94+
name: aio (CentOS OVN)
95+
needs:
96+
- check-changes
97+
- build-kayobe-image
98+
uses: ./.github/workflows/stackhpc-all-in-one.yml
99+
with:
100+
kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }}
101+
neutron_plugin: ovn
102+
OS_CLOUD: openstack
103+
if: ${{ needs.check-changes.outputs.aio == 'true' }}
104+
secrets: inherit
105+
if: ${{ ! failure() && ! cancelled() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
106+
79107
all-in-one-rocky-8-ovs:
80108
name: aio (Rocky OVS)
81109
needs:

doc/source/operations/ubuntu-jammy.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,14 @@ Common issues for all host types
154154
- Timeouts can become an issue with some hardware. The host will reboot once
155155
or twice depending on whether it needs to apply package updates. Edit the
156156
timeouts in the upgrade playbook (``ubuntu-upgrade.yml``) where required.
157+
- On systems using OVN networking, the Yoga Kolla Neutron container images
158+
include ``pyroute2`` 0.6.6. On Ubuntu Jammy systems this results in the
159+
Neutron OVN metadata agent failing to provision the datapath correctly. See
160+
`LP#1995735
161+
<https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1995735>`__ and
162+
`LP#2042954 <https://bugs.launchpad.net/kolla/+bug/2042954>`__ for
163+
details. A `fix <https://review.opendev.org/c/openstack/kolla/+/913584>`__
164+
is now available but new images have not yet been built.
157165

158166
Controllers
159167
===========

etc/kayobe/kolla.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ stackhpc_centos_stream_repos:
168168
tag: "appstream"
169169
- url: "{{ stackhpc_repo_centos_stream_extras_common_url }}"
170170
file: "CentOS-Stream-Extras-common.repo"
171+
tag: "extras-common"
172+
- url: "{{ stackhpc_repo_centos_stream_extras_url }}"
173+
file: "CentOS-Stream-Extras.repo"
171174
tag: "extras"
172175

173176
# List of repositories for EPEL.

etc/kayobe/kolla/globals.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,18 @@ kayobe_image_tags:
1515
centos: yoga-20231024T093507
1616
rocky: yoga-20231218T141822
1717
ubuntu: yoga-20231024T093507
18+
cinder:
19+
centos: yoga-20240701T132344
20+
rocky: yoga-20240701T132344
21+
ubuntu: yoga-20240701T132344
1822
cloudkitty:
1923
centos: yoga-20240503T150127
2024
rocky: yoga-20240503T150127
2125
ubuntu: yoga-20240503T150127
26+
glance:
27+
centos: yoga-20240702T105751
28+
rocky: yoga-20240702T105751
29+
ubuntu: yoga-20240702T105751
2230
heat:
2331
centos: yoga-20240320T082414
2432
rocky: yoga-20240320T082414
@@ -32,17 +40,24 @@ kayobe_image_tags:
3240
rocky: yoga-20240105T120257
3341
ubuntu: yoga-20231114T125927
3442
nova:
43+
centos: yoga-20240702T105751
44+
rocky: yoga-20240702T105751
45+
ubuntu: yoga-20240702T105751
46+
nova_libvirt:
3547
centos: yoga-20231113T171023
3648
rocky: yoga-20240105T120257
3749
ubuntu: yoga-20231103T161400
3850

3951
cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}"
52+
cinder_tag: "{% raw %}{{ kayobe_image_tags['cinder'][kolla_base_distro] }}{% endraw %}"
53+
glance_tag: "{% raw %}{{ kayobe_image_tags['glance'][kolla_base_distro] }}{% endraw %}"
4054
grafana_tag: yoga-20240510T114335
4155
heat_tag: "{% raw %}{{ kayobe_image_tags['heat'][kolla_base_distro] }}{% endraw %}"
4256
horizon_tag: yoga-20240510T114335
4357
magnum_tag: "{% raw %}{{ kayobe_image_tags['magnum'][kolla_base_distro] }}{% endraw %}"
4458
neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] }}{% endraw %}"
4559
nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}"
60+
nova_libvirt_tag: "{% raw %}{{ kayobe_image_tags['nova_libvirt'][kolla_base_distro] }}{% endraw %}"
4661
opensearch_tag: yoga-20231219T221916
4762
prometheus_tag: yoga-20240510T145442
4863

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
critical:
3+
- |
4+
Fixes `CVE-2024-32498
5+
<https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2024-32498>`_ with
6+
updated container images for Cinder, Glance and Nova services.
7+

0 commit comments

Comments
 (0)