aboutsummaryrefslogtreecommitdiff
path: root/docker/bifrost
diff options
context:
space:
mode:
authorSeunghun Lee <seunghun@stackhpc.com>2024-11-12 10:19:54 +0000
committerSeunghun Lee <seunghun@stackhpc.com>2025-02-05 15:36:52 +0000
commit4cab35b1a81055c3696e5fa42d794d6fc96076e6 (patch)
tree6ae51123bfd5d324c7f3200c3a1992b718d6733d /docker/bifrost
parent68fa7d302095b5362f176b7e690e3cbaa516fae0 (diff)
downloadkolla-4cab35b1a81055c3696e5fa42d794d6fc96076e6.tar.gz
kolla-4cab35b1a81055c3696e5fa42d794d6fc96076e6.zip
Change Bifrost Python upper-constraints source
Users can override the upper-constraints.txt by setting the source of openstack-base in kolla-build.conf. However, bifrost-base Dockerfile so far doesn't pass overridden upper-constraints file to Bifrost install playbook resulting the playbook not acknowledging it and just use upstream one. This change sets the source of Bifrost upper-constraints to use upper-constraints of openstack-base for consistency among all Kolla images With this, change the environment variable UPPER_CONSTRAINTS_FILE is only affecting kolla-toolbox image. Therefore, moved UPPER_CONSTRATINS_FILE variable example to the ``kolla_toolbox_pip_conf`` block of kolla-toolbox Dockerfile. Additionally, updated 'Python packages build options' section of documentation to represent latest method of changing Python package related options (including this change). Change-Id: I0a9c782ca1177ef84e4323cb1e5bfac0fb3f383c
Diffstat (limited to 'docker/bifrost')
-rw-r--r--docker/bifrost/bifrost-base/Dockerfile.j21
1 files changed, 1 insertions, 0 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2
index 3d0fe726f..8aa8f54ae 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/docker/bifrost/bifrost-base/Dockerfile.j2
@@ -45,6 +45,7 @@ RUN echo " " && \
$VENV/bin/ansible-galaxy collection install -r /bifrost/ansible-collections-requirements.yml && \
$VENV/bin/ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target \
/bifrost/playbooks/install.yaml \
+ -e upper_constraints_file="/requirements/upper-constraints.txt" \
-e git_branch={{ openstack_branch_slashed }} \
-e ipa_upstream_release={{ openstack_branch }} \
-e enable_inspector=true \