aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to 'docker')
-rw-r--r--docker/bifrost/bifrost-base/Dockerfile.j27
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2
index 2aa536cca..b44668726 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/docker/bifrost/bifrost-base/Dockerfile.j2
@@ -40,8 +40,11 @@ RUN apt-get --error-on=any update && \
{%- else %}
RUN echo " " && \
{%- endif %}
- 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 \
+ bash -c 'export VENV=/var/lib/kolla/venv && \
+ $VENV/bin/pip install "ansible>=6,<7" && \
+ $VENV/bin/ansible-galaxy collection install -r /bifrost/ansible-collections-requirements.yml && \
+ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target \
+ /bifrost/playbooks/install.yaml \
-e git_branch={{ openstack_branch_slashed }} \
-e ipa_upstream_release={{ openstack_branch }} \
-e @/tmp/build_arg.yml && \