openstack/kayobe
Code Issues Proposed changes

Ensure ironic-python-agent matches ironic-lib

Browse Source 
If ironic-python-agent is not installed in the IPA image using
upper-constraints, the ironic-lib selected by pip for installation may
be newer than ipa.

Use upper-constraints for the same version as ironic-python-agent when
installing it, by passing the DIB_REPOREF_requirements environment
variable to ironic-python-agent-builder.

Closes-Bug: #2089263
Change-Id: I6e33f9897dc7efc57987872ffccdfbe0fc78cc52
This commit is contained in:
Matt Anson 2024-11-21 14:26:26 +00:00 committed by Pierre Riteau
parent 3961c2ddbf
commit 89849c1cec
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@ ipa_build_dib_env_default:
DIB_RELEASE: "{{ '9-stream' if os_distribution == 'rocky' else os_release }}"
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 }}"
# Dictionary of additional environment variables to provide to Diskimage
# Builder (DIB) during IPA image build.

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

@ -62,15 +62,14 @@ image build``.
``ipa_build_dib_elements_extra``.
``ipa_build_dib_env_default``
Dictionary of default environment variables to provide to Diskimage Builder
(DIB) during IPA image build. Default is
``{"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 }}"}``.
(DIB) during IPA image build. Default is ``{"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": "{{ ipa_build_source_version }}"}`` if
``os_distribution`` is ``"rocky"`` else ``{"DIB_RELEASE": "{{ os_release
}}", "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 }}"}``.
``ipa_build_dib_env_extra``
Dictionary of additional environment variables to provide to Diskimage
Builder (DIB) during IPA image build. Default is empty.

6
releasenotes/notes/pin-ipa-requirements-f9566011b2400e6c.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Pin requirements for IPA image build to ensure that the ``ironic-lib``
version matches ``ironic-python-agent``.
LP#2089263 <https://bugs.launchpad.net/kayobe/+bug/2089263>`__