From cd26b72658cca7413b1f359985314a12ec194583 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 16 Jul 2024 17:55:39 +0200 Subject: bifrost: bump Ansible version to 8 (rpm) and 9 (deb) This is used by bifrost in setup script [1]. [1]: https://opendev.org/openstack/bifrost/src/commit/1c95336154c9ed3995bb63c4b4d16f344290b796/scripts/env-setup.sh#L9 Change-Id: Ia2721dd7459a11324726910c99ea4c357047631e --- docker/bifrost/bifrost-base/Dockerfile.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index bfe31dbbf..3d0fe726f 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -37,13 +37,13 @@ ENV ANSIBLE_GATHER_TIMEOUT=30 {% block bifrost_ansible_install %} {%- if base_package_type == 'deb' %} RUN apt-get --error-on=any update && \ + bash -c '$VENV/bin/pip install "ansible>=9,<10" && \ {%- else %} RUN echo " " && \ + bash -c '$VENV/bin/pip install "ansible>=8,<9" && \ {%- endif %} - 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 \ + $VENV/bin/ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target \ /bifrost/playbooks/install.yaml \ -e git_branch={{ openstack_branch_slashed }} \ -e ipa_upstream_release={{ openstack_branch }} \ -- cgit v1.2.3