From 1dff53e9aac78a9bcb46eaaefe8a5ec246c5f02b Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Fri, 20 Dec 2024 14:54:03 +0100 Subject: [PATCH 1/4] Use Caracal Magnum --- etc/kayobe/kolla/globals.yml | 7 ------- .../notes/update-magnum-containers-8814b1425ec45fc0.yaml | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) create mode 100644 releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 30d3af9bb..c36b659b5 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -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 diff --git a/releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml b/releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml new file mode 100644 index 000000000..d15a2da8e --- /dev/null +++ b/releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Updates Magnum to a proper Caracal release version following critical bug + upstream merged & backported. From fdb647ccb267d2575bb4463220614dcaa063ab19 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Thu, 2 Jan 2025 10:44:13 +0100 Subject: [PATCH 2/4] Magnum: override rather than add secondary driver Upstream Kolla installs magnum-cluster-api by default. Magnum is likely to pick up that driver, so exclude it from the install list and avoid explicitly disabling it in the config. --- etc/kayobe/kolla.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index b7e75fd8f..ac5c9b778 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -344,10 +344,6 @@ kolla_build_blocks: 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: @@ -360,6 +356,9 @@ kolla_build_customizations_common: - /additions/* ironic_inspector_pip_packages_append: - /additions/* + magnum_base_pip_packages_override: + - /magnum[osprofiler] + - magnum-capi-helm neutron_server_packages_append: - python3-libvirt - python3-ethtool From 60a557840e2554cef4cfde85825fb108cd8ec397 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Thu, 2 Jan 2025 15:18:32 +0100 Subject: [PATCH 3/4] Update Magnum tags --- etc/kayobe/kolla-image-tags.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index fa582ada9..a8a98e937 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -10,6 +10,9 @@ kolla_image_tags: ubuntu-jammy: 2024.1-ubuntu-jammy-20241125T093138 cinder: ubuntu-jammy: 2024.1-ubuntu-jammy-20241204T081836 + magnum: + rocky-9: 2024.1-rocky-9-20250102T094625 + ubuntu-jammy: 2024.1-ubuntu-jammy-20250102T094625 nova: ubuntu-jammy: 2024.1-ubuntu-jammy-20241004T094540 neutron: From abe85b8ded66274fcd8607b9cbc8fae260da5af2 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Tue, 7 Jan 2025 14:06:49 +0100 Subject: [PATCH 4/4] Remove Magnum build footer & update reno --- etc/kayobe/kolla.yml | 2 -- .../notes/update-magnum-containers-8814b1425ec45fc0.yaml | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index ac5c9b778..350abe25c 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -342,8 +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 # Dict mapping image customization variable names to their values. # Each variable takes the form: diff --git a/releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml b/releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml index d15a2da8e..c7af47525 100644 --- a/releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml +++ b/releasenotes/notes/update-magnum-containers-8814b1425ec45fc0.yaml @@ -2,4 +2,5 @@ fixes: - | Updates Magnum to a proper Caracal release version following critical bug - upstream merged & backported. + upstream merged & backported. Also, removes the pin for CAPI Helm driver + version and brings in the latest (1.2.0).