From ad3f6f10a2dd7078c69efc1418a2c70b05dc2a54 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 1 Dec 2021 06:27:55 +0100 Subject: [PATCH] Add overcloud_dib_upper_constraints_file variable This variable allows to customise the upper constraints file used to install packages inside the overcloud-host-image-dib virtual environment. This can be used when we need a newer version of diskimage-builder than the one available in upper constraints for the current release. Change-Id: I2f6c2f92903815973865ef0f5d6b867d5b995bd5 Story: 2002098 Task: 44101 --- ansible/group_vars/all/overcloud-dib | 5 +++++ ansible/overcloud-host-image-build.yml | 2 +- etc/kayobe/overcloud-dib.yml | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ansible/group_vars/all/overcloud-dib b/ansible/group_vars/all/overcloud-dib index 0f8d76f5b..9c0c0ffdc 100644 --- a/ansible/group_vars/all/overcloud-dib +++ b/ansible/group_vars/all/overcloud-dib @@ -52,3 +52,8 @@ overcloud_dib_env_vars: "{{ overcloud_dib_env_vars_default | combine(overcloud_d # List of DIB packages to install. Default is to install no extra packages. overcloud_dib_packages: [] + +# 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_upper_constraints_file: "{{ pip_upper_constraints_file }}" diff --git a/ansible/overcloud-host-image-build.yml b/ansible/overcloud-host-image-build.yml index 1855607cc..82d4b3055 100644 --- a/ansible/overcloud-host-image-build.yml +++ b/ansible/overcloud-host-image-build.yml @@ -19,7 +19,7 @@ vars: os_images_venv: "{{ virtualenv_path }}/overcloud-host-image-dib" os_images_package_state: latest - os_images_upper_constraints_file: "{{ pip_upper_constraints_file }}" + os_images_upper_constraints_file: "{{ overcloud_dib_upper_constraints_file }}" os_images_cache: "{{ image_cache_path }}" os_images_common: "" os_images_list: diff --git a/etc/kayobe/overcloud-dib.yml b/etc/kayobe/overcloud-dib.yml index 41bce702a..0a95c97e2 100644 --- a/etc/kayobe/overcloud-dib.yml +++ b/etc/kayobe/overcloud-dib.yml @@ -45,6 +45,11 @@ # List of DIB packages to install. Default is to install no extra packages. #overcloud_dib_packages: +# 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_upper_constraints_file: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes