openstack/kayobe
Code Issues Proposed changes

ipa: Use openstack_branch instead of master

Browse Source 
ironic-python-agent-builder has stable branches since Wallaby -
let's use them.

Also as per ipab docs [1] - the env vars for overriding ipa repo
are:
- DIB_REPOREF_ironic_python_agent
- DIB_REPOLOCATION_ironic_python_agent

[1]: https://docs.openstack.org/ironic-python-agent-builder/latest/admin/dib.html#building

Story: 2009755
Task: 44224

Change-Id: I025532156de831a0e7d025d61601a38202de10ff
This commit is contained in:
Michal Nasiadka 2021-12-08 19:43:04 +01:00
parent b5f0a17acf
commit b62a9aaefc
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/group_vars/all/ipa
View File

@ -16,8 +16,8 @@ ipa_build_source_version: "{{ openstack_branch }}"
# URL of IPA builder source repository. # URL of IPA builder source repository.
ipa_builder_source_url: "https://opendev.org/openstack/ironic-python-agent-builder" ipa_builder_source_url: "https://opendev.org/openstack/ironic-python-agent-builder"
# Version of IPA builder source repository. Default is master. # Version of IPA builder source repository. Default is {{ openstack_branch }}.
ipa_builder_source_version: master ipa_builder_source_version: "{{ openstack_branch }}"
# List of default Diskimage Builder (DIB) elements to use when building IPA # List of default Diskimage Builder (DIB) elements to use when building IPA
# images. Default is ["centos", "enable-serial-console", # images. Default is ["centos", "enable-serial-console",
@ -45,8 +45,8 @@ ipa_build_dib_env_default:
# TODO(mgoddard): Use {{ os_release }} here when we use os_distribution # TODO(mgoddard): Use {{ os_release }} here when we use os_distribution
# above. # above.
DIB_RELEASE: "8-stream" DIB_RELEASE: "8-stream"
DIB_REPOLOCATION_ironic_agent: "{{ ipa_build_source_url }}" DIB_REPOLOCATION_ironic_python_agent: "{{ ipa_build_source_url }}"
DIB_REPOREF_ironic_agent: "{{ ipa_build_source_version }}" DIB_REPOREF_ironic_python_agent: "{{ ipa_build_source_version }}"
# Dictionary of additional environment variables to provide to Diskimage # Dictionary of additional environment variables to provide to Diskimage
# Builder (DIB) during IPA image build. # Builder (DIB) during IPA image build.

2
etc/kayobe/ipa.yml
View File

@ -16,7 +16,7 @@
# URL of IPA builder source repository. # URL of IPA builder source repository.
#ipa_builder_source_url: #ipa_builder_source_url:
# Version of IPA builder source repository. Default is master. # Version of IPA builder source repository. Default is {{ openstack_branch }}.
#ipa_builder_source_version: #ipa_builder_source_version:
# List of default Diskimage Builder (DIB) elements to use when building IPA # List of default Diskimage Builder (DIB) elements to use when building IPA

6
releasenotes/notes/ipa-branch-b29c377c531013a8.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes an issue with IPA image builds which used the ``master``
branch of ``ironic-python-agent``, even on stable releases
of Kayobe, or when explicitly setting ``ipa_build_source_version``.