Skip to content

Amphorae build fixes #2436

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

Open
cityofships wants to merge 2 commits into
base: stackhpc/2025.1
Choose a base branch
from
+10 −2
Open

Amphorae build fixes #2436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0b67d3
Use the latest DIB for building amphorae
cityofships Jul 17, 2026
cf8d441
Fix package installs for amphorae builds
cityofships Jul 17, 2026
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
4 changes: 2 additions & 2 deletions etc/kayobe/ansible/maintenance/octavia-amphora-image-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"

@dougszumski dougszumski Jul 30, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: It would be better to set the default here given that the playbook relies on this variable being defined. Then -e on the command line still works.

eg. similar to this - just a comment used in the file included with -e:
https://github.com/openstack/kayobe/blob/master/etc/kayobe/overcloud-dib.yml#L76

amphora_image_dest: "{{ image_cache_path }}/amphora-x64-haproxy-{{ openstack_release }}.qcow2"
tasks:
- name: Install EPEL
Expand All @@ -19,16 +18,17 @@
packages_common:
- debootstrap
- git
- python3-venv
packages_for_os_family:
RedHat:
- qemu-img
- e2fsprogs
- policycoreutils-python-utils
- python3-devel
- yum-utils
Comment thread
cityofships marked this conversation as resolved.
Debian:
- qemu-utils
- kpartx
- python3-venv
ansible.builtin.package:
name: "{{ packages_common + packages_for_os_family[ansible_facts.os_family] }}"

Expand Down
3 changes: 3 additions & 0 deletions etc/kayobe/stackhpc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,9 @@ download_amphora_from_ark: true
# Octavia Amphora image version
stackhpc_amphora_image_version: "2025.1-20260319T131237"

@Alex-Welsh Alex-Welsh Jul 30, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cityofships did you mean to also bump the image at the same time?

@cityofships cityofships Jul 30, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, let's see how it behaves in the workflow


# Whether to use a constraint for diskimage-builder version, default is none.
amphora_dib_upper_constraints_file: ""

################################################################################
# Certificate Authority

Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/use-latest-dib-amphorae-c43d903780c08123.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Loading