openstack/kayobe
Code Issues Proposed changes

Merge "Fix ipa_build_dib_elements_default comments"

Browse Source
This commit is contained in:
Zuul 2023-09-21 12:58:22 +00:00 committed by Gerrit Code Review
commit 3089774cf3
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 }}"

8
doc/source/configuration/reference/ironic-python-agent.rst
View File

@ -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

3
etc/kayobe/ipa.yml
View File

@ -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