Skip to content

Commit

Permalink
[bifrost] Force Bifrost to use the correct u-c
Browse files Browse the repository at this point in the history
Following up on [1], Bifrost also needs to use correct u-c and,
surprise-surprise, this is set via a third variable, this time
environment one for the bash script. Oh well. Let's do it.
This has the added benefit of not requiring additional
download of u-c as it reuses the already existing one.

[1] https://review.opendev.org/c/openstack/kolla/+/842276

Change-Id: I2cc79c476d089977b57006dd4ce2e9a8c6206aa1
(cherry picked from commit 633c89b)
  • Loading branch information
yoctozepto committed May 22, 2022
1 parent 0009ffb commit 6a6fce5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docker/bifrost/bifrost-base/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN apt-get update && \
{%- else %}
RUN echo " " && \
{%- endif %}
bash -c './scripts/env-setup.sh && \
bash -c 'TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt ./scripts/env-setup.sh && \
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
-e @/tmp/build_arg.yml && \
{%- if base_package_type == 'deb' %}
Expand Down

0 comments on commit 6a6fce5

Please sign in to comment.