From 508bd3fe45e0615caa8fcb8b7dcb7194903647cb Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Tue, 12 Sep 2023 14:52:18 +0100 Subject: [PATCH] Fix ipa_build_dib_elements_default comments The default value for ipa_build_dib_elements_default was previously changed in Iefd2d0b7a3a3e07f5c112d58e2ec0b3da0a747d3. This change updates the comments to match. Change-Id: I47e5acb19c806a1067879c9cf5fa5ccb7f07ccd4 --- ansible/inventory/group_vars/all/ipa | 3 ++- .../configuration/reference/ironic-python-agent.rst | 8 +++++++- etc/kayobe/ipa.yml | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ansible/inventory/group_vars/all/ipa b/ansible/inventory/group_vars/all/ipa index a9adeca88..a2c072275 100644 --- a/ansible/inventory/group_vars/all/ipa +++ b/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 }}" diff --git a/doc/source/configuration/reference/ironic-python-agent.rst b/doc/source/configuration/reference/ironic-python-agent.rst index d1dbbab1b..4e0de0a60 100644 --- a/doc/source/configuration/reference/ironic-python-agent.rst +++ b/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 diff --git a/etc/kayobe/ipa.yml b/etc/kayobe/ipa.yml index 5877d039a..b3df6dd44 100644 --- a/etc/kayobe/ipa.yml +++ b/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