openstack/kayobe
Code Issues Proposed changes

Build Ubuntu images with IPA when on Ubuntu

Browse Source 
Change ``ipa_build_dib_elements_default`` and
``ipa_build_dib_env_default`` to use ``os_distribution`` and
``os_release`` by default. This allows for Ubuntu images to be built
when running on Ubuntu.

Rocky will still build CentOS images, as Rocky IPA images have not been
tested yet.

Change-Id: Iefd2d0b7a3a3e07f5c112d58e2ec0b3da0a747d3
This commit is contained in:
Matt Crees 2023-01-16 10:10:24 +00:00 committed by Pierre Riteau
parent 51a9019c6b
commit bdaeed184b
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/inventory/group_vars/all/ipa
View File

@ -26,8 +26,8 @@ ipa_build_dib_host_packages_extra: []
# images. Default is ["centos", "enable-serial-console", # images. Default is ["centos", "enable-serial-console",
# "ironic-python-agent-ramdisk"]. # "ironic-python-agent-ramdisk"].
ipa_build_dib_elements_default: ipa_build_dib_elements_default:
# TODO(mgoddard): Use {{ os_distribution }} here when Ubuntu IPA builds work. # TODO(mattcrees): Use {{ os_distribution }} here when Rocky IPA builds work.
- centos - "{{ 'centos' if os_distribution == 'rocky' else os_distribution }}"
- enable-serial-console - enable-serial-console
- ironic-python-agent-ramdisk - ironic-python-agent-ramdisk
@ -45,9 +45,8 @@ ipa_build_dib_elements: >
# Dictionary of default environment variables to provide to Diskimage Builder # Dictionary of default environment variables to provide to Diskimage Builder
# (DIB) during IPA image build. # (DIB) during IPA image build.
ipa_build_dib_env_default: ipa_build_dib_env_default:
# TODO(mgoddard): Use {{ os_release }} here when we use os_distribution # TODO(mattcrees): Use {{ os_release }} here when Rocky IPA builds work.
# above. DIB_RELEASE: "{{ '9-stream' if os_distribution == 'rocky' else os_release }}"
DIB_RELEASE: "9-stream"
DIB_REPOLOCATION_ironic_python_agent: "{{ ipa_build_source_url }}" DIB_REPOLOCATION_ironic_python_agent: "{{ ipa_build_source_url }}"
DIB_REPOREF_ironic_python_agent: "{{ ipa_build_source_version }}" DIB_REPOREF_ironic_python_agent: "{{ ipa_build_source_version }}"

7
playbooks/kayobe-seed-base/overrides.yml.j2
View File

@ -32,9 +32,14 @@ aio_bridge_ports:
# Build seed deployment images (IPA) with extra-hardware element # Build seed deployment images (IPA) with extra-hardware element
ipa_build_images: {{ build_images }} ipa_build_images: {{ build_images }}
ipa_build_dib_elements_extra: ipa_build_dib_elements_extra:
- "extra-hardware" # extra-hardware is currently failing on Ubuntu
- "{% raw %}{{ 'extra-hardware' if os_distribution != 'ubuntu' else '' }}{% endraw %}"
- "openstack-ci-mirrors" - "openstack-ci-mirrors"
# Workaround for limited tmpfs space in CI
ipa_build_dib_env_extra:
DIB_NO_TMPFS: 1
# Build overcloud host image. # Build overcloud host image.
overcloud_dib_build_host_images: {{ build_images }} overcloud_dib_build_host_images: {{ build_images }}
overcloud_dib_elements_extra: overcloud_dib_elements_extra:

8
releasenotes/notes/build-ubuntu-ipa-images-when-on-ubuntu-5dfcdfdb673343ea.yaml Normal file
View File

@ -0,0 +1,8 @@
---
upgrade:
- |
``ipa_build_dib_elements_default`` and ``ipa_build_dib_env_default`` now
use ``os_distribution`` and ``os_release`` by default. This means that
Ubuntu images will now be built with the Ironic Python Agent when running
on Ubuntu. Rocky will still build CentOS images, as Rocky IPA images have
not been tested yet.