Merge pull request #351 from stackhpc/upstream/2024.1-2024-12-02

Synchronise 2024.1 with upstream
stackhpc · Dec 3, 2024 · 354b1d8 · 354b1d8
2 parents a794f10 + 4c2b79f
commit 354b1d8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/ansible/inventory/group_vars/all/ipa b/ansible/inventory/group_vars/all/ipa
@@ -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.

diff --git a/doc/source/configuration/reference/ironic-python-agent.rst b/doc/source/configuration/reference/ironic-python-agent.rst
@@ -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.

diff --git a/playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py b/playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py
@@ -157,13 +157,13 @@ def test_docker_storage_driver_is_overlay2(host):
 @pytest.mark.parametrize('user', ['kolla', 'stack'])
 def test_docker_image_download(host, user):
     with host.sudo(user):
-        host.check_output("docker pull alpine")
+        host.check_output("docker pull quay.io/podman/hello")
 
 
 @pytest.mark.parametrize('user', ['kolla', 'stack'])
 def test_docker_container_run(host, user):
     with host.sudo(user):
-        host.check_output("docker run --rm alpine /bin/true")
+        host.check_output("docker run --rm quay.io/podman/hello")
 
 
 def test_timezone(host):

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>`__