Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Caracal's Magnum #1432

Open
wants to merge 5 commits into
base: stackhpc/2024.1
Choose a base branch
from
Open

Use Caracal's Magnum #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1dff53e
Use Caracal Magnum
cityofships Dec 20, 2024
fdb647c
Magnum: override rather than add secondary driver
cityofships Jan 2, 2025
60a5578
Update Magnum tags
cityofships Jan 2, 2025
abe85b8
Remove Magnum build footer & update reno
cityofships Jan 7, 2025
54c3f4f
Merge branch 'stackhpc/2024.1' into unpin_magnum
Alex-Welsh Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions etc/kayobe/kolla-image-tags.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ kolla_image_tags:
openstack:
rocky-9: 2024.1-rocky-9-20241218T141751
ubuntu-jammy: 2024.1-ubuntu-jammy-20241218T141809
magnum:
rocky-9: 2024.1-rocky-9-20250102T094625
ubuntu-jammy: 2024.1-ubuntu-jammy-20250102T094625
9 changes: 3 additions & 6 deletions etc/kayobe/kolla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,6 @@ kolla_build_blocks:
&& grafana-cli plugins install grafana-opensearch-datasource
ironic_inspector_header: |
ADD additions-archive /
magnum_base_footer: |
RUN curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | head -n -1 | bash
{% raw %}
{% set magnum_capi_packages = ['magnum-capi-helm==1.1.0'] %}
RUN {{ macros.install_pip(magnum_capi_packages | customizable("pip_packages")) }}
{% endraw %}

# Dict mapping image customization variable names to their values.
# Each variable takes the form:
Expand All @@ -360,6 +354,9 @@ kolla_build_customizations_common:
- /additions/*
ironic_inspector_pip_packages_append:
- /additions/*
magnum_base_pip_packages_override:
- /magnum[osprofiler]
- magnum-capi-helm
cityofships marked this conversation as resolved.
Show resolved Hide resolved
neutron_server_packages_append:
- python3-libvirt
- python3-ethtool
Expand Down
7 changes: 0 additions & 7 deletions etc/kayobe/kolla/globals.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@ kolla_image_tags:
# Variables defining which tag to use for each container's image.
{{ lookup('pipe', 'python3 ' ~ kayobe_config_path ~ '/../../tools/kolla-images.py list-tag-vars') }}

# FIXME: Pin to Antelope Magnum until it is working again upstream
kayobe_image_tags:
magnum:
rocky: 2023.1-rocky-9-20240821T102442
ubuntu: 2023.1-ubuntu-jammy-20240821T102442

magnum_tag: "{% raw %}{{ kayobe_image_tags['magnum'][kolla_base_distro] }}{% endraw %}"
#############################################################################
# Monitoring and alerting related settings

Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
fixes:
- |
Updates Magnum to a proper Caracal release version following critical bug
cityofships marked this conversation as resolved.
Show resolved Hide resolved
upstream merged & backported. Also, removes the pin for CAPI Helm driver
version and brings in the latest (1.2.0).