Merge "Ensure ironic-python-agent matches ironic-lib" into unmaintain…

…ed/2023.1
stackhpc · Jan 6, 2025 · e2d9810 · e2d9810
2 parents 0bc208f + 0c9bbd5
commit e2d9810
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/ansible/inventory/group_vars/all/ipa b/ansible/inventory/group_vars/all/ipa
@@ -49,6 +49,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.

diff --git a/doc/source/configuration/reference/ironic-python-agent.rst b/doc/source/configuration/reference/ironic-python-agent.rst
@@ -60,11 +60,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 }}"}``.
+    (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.

diff --git a/releasenotes/notes/pin-ipa-requirements-f9566011b2400e6c.yaml b/releasenotes/notes/pin-ipa-requirements-f9566011b2400e6c.yaml
@@ -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>`__