Merge "Fix ipa_build_dib_elements_default comments"

ansible/inventory/group_vars/all/ipa

@@ -24,7 +24,8 @@ ipa_build_dib_host_packages_extra: []
 
 # List of default Diskimage Builder (DIB) elements to use when building IPA
 # images. Default is ["centos", "enable-serial-console",
-# "ironic-python-agent-ramdisk"].
+# "ironic-python-agent-ramdisk"] when os_distribution is "rocky", and
+# ["ubuntu", "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 }}"

doc/source/configuration/reference/ironic-python-agent.rst

@@ -50,7 +50,9 @@ image build``.
 ``ipa_build_dib_elements_default``
     List of default Diskimage Builder (DIB) elements to use when building IPA
     images. Default is ``["centos", "enable-serial-console",
-    "ironic-python-agent-ramdisk"]``.
+    "ironic-python-agent-ramdisk"]`` when ``os_distribution`` is ``"rocky"``, and
+    ``["ubuntu", "enable-serial-console", "ironic-python-agent-ramdisk"]``
+    otherwise.
 ``ipa_build_dib_elements_extra``
     List of additional Diskimage Builder (DIB) elements to use when building IPA
     images. Default is empty.
@@ -64,6 +66,10 @@ image build``.
     ``{"DIB_RELEASE": "9-stream", "DIB_REPOLOCATION_ironic_python_agent": "{{
     ipa_build_source_url }}", "DIB_REPOREF_ironic_python_agent": "{{
     ipa_build_source_version }}", "DIB_REPOREF_requirements": "{{
+    openstack_branch }}"}`` if ``os_distribution`` is ``"rocky"`` else
+    ``{"DIB_RELEASE": "jammy", "DIB_REPOLOCATION_ironic_python_agent": "{{
+    ipa_build_source_url }}", "DIB_REPOREF_ironic_python_agent": "{{
+    ipa_build_source_version }}", "DIB_REPOREF_requirements": "{{
     openstack_branch }}"}``.
 ``ipa_build_dib_env_extra``
     Dictionary of additional environment variables to provide to Diskimage

etc/kayobe/ipa.yml

@@ -24,7 +24,8 @@
 
 # List of default Diskimage Builder (DIB) elements to use when building IPA
 # images. Default is ["centos", "enable-serial-console",
-# "ironic-python-agent-ramdisk"].
+# "ironic-python-agent-ramdisk"] when os_distribution is "rocky", and
+# ["ubuntu", "enable-serial-console", "ironic-python-agent-ramdisk"] otherwise.
 #ipa_build_dib_elements_default:
 
 # List of additional Diskimage Builder (DIB) elements to use when building IPA