Add new DIB upper constraints variables

overcloud-dib: added overcloud_dib_dib_upper_constraints_file
ipa: added ipa_build_dib_upper_constraints_file
added os_images_dib_upper_constraints_file to image build
playbooks

New variables were added to facilitate control over the DIB
upper constraints without changing them for other components.
They are empty by default in order to facilitate Rocky9
image builds.

Change-Id: Ib50dd61685f13c60ace67213ddd1e714a80dece3

ansible/inventory/group_vars/all/ipa

@@ -88,6 +88,10 @@ ipa_build_dib_packages: []
 # used for building IPA images. Default is {{ pip_upper_constraints_file }}.
 ipa_build_upper_constraints_file: "{{ pip_upper_constraints_file }}"
 
+# Upper constraints file for installation of DIB to build IPA images.
+# Default is empty string.
+ipa_build_dib_upper_constraints_file: ""
+
 ###############################################################################
 # Ironic Python Agent (IPA) images configuration.
 

ansible/inventory/group_vars/all/overcloud-dib

@@ -93,3 +93,7 @@ overcloud_dib_git_elements: >-
 # used for building overcloud host disk images. Default is {{
 # pip_upper_constraints_file }}.
 overcloud_dib_upper_constraints_file: "{{ pip_upper_constraints_file }}"
+
+# Upper constraints file for installation of DIB to build overcloud host disk images.
+# Default is empty string.
+overcloud_dib_dib_upper_constraints_file: ""

ansible/overcloud-host-image-build.yml

@@ -26,6 +26,7 @@
             os_images_venv: "{{ virtualenv_path }}/overcloud-host-image-dib"
             os_images_package_state: latest
             os_images_upper_constraints_file: "{{ overcloud_dib_upper_constraints_file }}"
+            os_images_dib_upper_constraints_file: "{{ overcloud_dib_dib_upper_constraints_file }}"
             os_images_cache: "{{ image_cache_path }}"
             os_images_common: ""
             os_images_list: "{{ overcloud_dib_host_images }}"

ansible/overcloud-ipa-build.yml

@@ -40,6 +40,7 @@
             os_images_venv: "{{ virtualenv_path }}/ipa-build-dib"
             os_images_package_state: latest
             os_images_upper_constraints_file: "{{ ipa_build_upper_constraints_file }}"
+            os_images_dib_upper_constraints_file: "{{ ipa_build_dib_upper_constraints_file }}"
             os_images_cache: "{{ image_cache_path }}"
             os_images_common: ""
             os_images_list:

doc/source/configuration/reference/overcloud-dib.rst

@@ -99,6 +99,9 @@ the configuration drive built by Bifrost during provisioning.
     Upper constraints file for installing packages in the virtual environment
     used for building overcloud host disk images. Default is ``{{
     pip_upper_constraints_file }}``.
+``overcloud_dib_dib_upper_constraints_file``
+    Upper constraints file for installation of DIB to build overcloud
+    host disk images. Default is empty string.
 
 Disk images are built with the following command:
 

etc/kayobe/ipa.yml

@@ -68,6 +68,10 @@
 # used for building IPA images. Default is {{ pip_upper_constraints_file }}.
 #ipa_build_upper_constraints_file:
 
+# Upper constraints file for installation of DIB to build IPA images.
+# Default is empty string.
+#ipa_build_dib_upper_constraints_file:
+
 ###############################################################################
 # Ironic Python Agent (IPA) images configuration.
 

etc/kayobe/overcloud-dib.yml

@@ -79,6 +79,10 @@
 # pip_upper_constraints_file }}.
 #overcloud_dib_upper_constraints_file:
 
+# Upper constraints file for installation of DIB to build overcloud host
+# disk images. Default is empty string.
+#overcloud_dib_dib_upper_constraints_file:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

releasenotes/notes/upper_constraints_split-a9548c8127c13535.yaml

@@ -0,0 +1,14 @@
+---
+upgrade:
+  - |
+    Updates the ``stackhpc.os-images`` to version to 0.16.0. This new releases
+    separates configuration of upper constraints for diskimage-builder (DIB)
+    from those used by the OpenStack SDK and client. This allows operators to
+    use a newer version of DIB while keeping compatible versions of the
+    OpenStack SDK and client. This is configured with the following variables:
+
+    * ``ipa_build_dib_upper_constraints_file`` in ``ipa.yml``
+    * ``overcloud_dib_dib_upper_constraints_file`` in ``overcloud-dib.yml``
+
+    The variables are empty by default in order to allow for Rocky9
+    image builds.

requirements.yml

@@ -43,7 +43,7 @@ roles:
   - src: stackhpc.mellanox-switch
     version: v1.0.0
   - src: stackhpc.os-images
-    version: v1.15.0
+    version: v1.16.0
   - src: stackhpc.os-ironic-state
     version: v1.3.1
   - src: stackhpc.os-networks