Merge "Build Rocky based IPA images"

Author: Zuul

ansible/inventory/group_vars/all/ipa

@@ -23,16 +23,16 @@ ipa_builder_source_version: "{{ openstack_branch }}"
 ipa_build_dib_host_packages_extra: [ 'zstd' ]
 
 # List of default Diskimage Builder (DIB) elements to use when building IPA
-# images. Default is ["centos", "dynamic-login", "enable-serial-console",
-# "ironic-python-agent-ramdisk"] when os_distribution is "rocky", and
-# ["ubuntu", "dynamic-login", "enable-serial-console",
+# images. Default is ["rocky-container", "dynamic-login",
+# "enable-serial-console", "ironic-python-agent-ramdisk"] when os_distribution
+# is "rocky", and ["ubuntu", "dynamic-login", "enable-serial-console",
 # "ironic-python-agent-ramdisk"] otherwise.
 ipa_build_dib_elements_default:
-  # TODO(mattcrees): Use {{ os_distribution }} here when Rocky IPA builds work.
-  - "{{ 'centos' if os_distribution == 'rocky' else os_distribution }}"
+  - "{{ 'rocky-container' if os_distribution == 'rocky' else os_distribution }}"
   - dynamic-login
   - enable-serial-console
   - ironic-python-agent-ramdisk
+  - baremetal
 
 # List of additional Diskimage Builder (DIB) elements to use when building IPA
 # images. Default is none.
@@ -48,8 +48,9 @@ ipa_build_dib_elements: >
 # Dictionary of default environment variables to provide to Diskimage Builder
 # (DIB) during IPA image build.
 ipa_build_dib_env_default:
-  # TODO(mattcrees): Use {{ os_release }} here when Rocky IPA builds work.
-  DIB_RELEASE: "{{ '9-stream' if os_distribution == 'rocky' else os_release }}"
+  DIB_RELEASE: "{{ os_release }}"
+  DIB_CONTAINERFILE_RUNTIME: "{{ container_engine }}"
+  DIB_CONTAINERFILE_RUNTIME_ROOT: "{{ (container_engine == 'podman') | int }}"
   DIB_REPOLOCATION_ironic_python_agent: "{{ ipa_build_source_url }}"
   DIB_REPOREF_ironic_python_agent: "{{ ipa_build_source_version }}"
   DIB_REPOREF_requirements: "{{ ipa_build_source_version }}"
@@ -84,8 +85,10 @@ ipa_build_dib_git_elements_extra: []
 ipa_build_dib_git_elements: >-
   {{ ipa_build_dib_git_elements_default + ipa_build_dib_git_elements_extra }}
 
-# List of DIB packages to install. Default is empty list.
-ipa_build_dib_packages: []
+# List of DIB packages to install. Default is ["python3-yaml"] when
+# when os_distribution is "rocky", otherwise [].
+ipa_build_dib_packages: >-
+  {{ ["python3-yaml"] if os_distribution == 'rocky' else [] }}
 
 # Upper constraints file for installing packages in the virtual environment
 # used for building IPA images. Default is {{ pip_upper_constraints_file }}.

etc/kayobe/ipa.yml

@@ -23,9 +23,9 @@
 #ipa_build_dib_host_packages_extra:
 
 # List of default Diskimage Builder (DIB) elements to use when building IPA
-# images. Default is ["centos", "dynamic-login", "enable-serial-console",
-# "ironic-python-agent-ramdisk"] when os_distribution is "rocky", and
-# ["ubuntu", "dynamic-login", "enable-serial-console",
+# images. Default is ["rocky-container", "dynamic-login",
+# "enable-serial-console", "ironic-python-agent-ramdisk"] when os_distribution
+# is "rocky", and ["ubuntu", "dynamic-login", "enable-serial-console",
 # "ironic-python-agent-ramdisk"] otherwise.
 #ipa_build_dib_elements_default:
 
@@ -64,7 +64,8 @@
 # ipa_build_dib_git_elements_default and ipa_build_dib_git_elements_extra.
 #ipa_build_dib_git_elements:
 
-# List of DIB packages to install. Default is empty list.
+# List of DIB packages to install. Default is ["python3-yaml"] when
+# when os_distribution is "rocky", otherwise [].
 #ipa_build_dib_packages:
 
 # Upper constraints file for installing packages in the virtual environment

releasenotes/notes/build-rocky-ipa-f59e45e6fea6a4c4.yaml

@@ -0,0 +1,11 @@
+---
+upgrade:
+  - |
+    Rocky Linux based Ironic Python Agent images are now built in Rocky Linux
+    based deployments rather than CentOS Stream:
+    ``ipa_build_dib_elements_default`` uses ``rocky-container`` element;
+    ``ipa_build_dib_packages`` includes the ``python3-yaml`` package;
+    ``ipa_build_dib_env_default`` uses specified ``os_release``;
+    and container runtime is set to ``container_engine``.
+  - |
+    ``baremetal`` element now included in ``ipa_build_dib_elements_default``