From c0b67d3c3eb6ece13a740b48c8371ca7c3652b9e Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Fri, 17 Jul 2026 10:35:10 +0200 Subject: [PATCH 1/2] Use the latest DIB for building amphorae --- .../ansible/maintenance/octavia-amphora-image-build.yml | 1 - etc/kayobe/stackhpc.yml | 3 +++ .../notes/use-latest-dib-amphorae-c43d903780c08123.yaml | 5 +++++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/use-latest-dib-amphorae-c43d903780c08123.yaml diff --git a/etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml b/etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml index 93dc1e5683..a4ad3e144e 100644 --- a/etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml +++ b/etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml @@ -2,7 +2,6 @@ - name: Build an Octavia Amphora image hosts: "{{ amphora_builder_group | default('seed') }}" vars: - amphora_dib_upper_constraints_file: "{{ pip_upper_constraints_file }}" amphora_image_dest: "{{ image_cache_path }}/amphora-x64-haproxy-{{ openstack_release }}.qcow2" tasks: - name: Install EPEL diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index 122444a19d..5b9c048ff6 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -270,6 +270,9 @@ download_amphora_from_ark: true # Octavia Amphora image version stackhpc_amphora_image_version: "2025.1-20260319T131237" +# Whether to use a constraint for diskimage-builder version, default is none. +amphora_dib_upper_constraints_file: "" + ################################################################################ # Certificate Authority diff --git a/releasenotes/notes/use-latest-dib-amphorae-c43d903780c08123.yaml b/releasenotes/notes/use-latest-dib-amphorae-c43d903780c08123.yaml new file mode 100644 index 0000000000..24e7adfccb --- /dev/null +++ b/releasenotes/notes/use-latest-dib-amphorae-c43d903780c08123.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Amphora image build playbook now uses the latest diskimage-builder version + by default. This ensures better operation and compatibility in general. From cf8d441d978bcc8ba31063808fbd8d82e30e6d51 Mon Sep 17 00:00:00 2001 From: Piotr Parczewski Date: Fri, 17 Jul 2026 10:37:09 +0200 Subject: [PATCH 2/2] Fix package installs for amphorae builds python3-venv is not available on RH family systems. --- etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml b/etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml index a4ad3e144e..c5946eb3a8 100644 --- a/etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml +++ b/etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml @@ -18,16 +18,17 @@ packages_common: - debootstrap - git - - python3-venv packages_for_os_family: RedHat: - qemu-img - e2fsprogs - policycoreutils-python-utils + - python3-devel - yum-utils Debian: - qemu-utils - kpartx + - python3-venv ansible.builtin.package: name: "{{ packages_common + packages_for_os_family[ansible_facts.os_family] }}"