Skip to content

Commit ccb13b6

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "bifrost: bump Ansible version to 8 (rpm) and 9 (deb)"
2 parents 26f9d8f + cd26b72 commit ccb13b6

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

docker/bifrost/bifrost-base/Dockerfile.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ ENV ANSIBLE_GATHER_TIMEOUT=30
3737
{% block bifrost_ansible_install %}
3838
{%- if base_package_type == 'deb' %}
3939
RUN apt-get --error-on=any update && \
40+
bash -c '$VENV/bin/pip install "ansible>=9,<10" && \
4041
{%- else %}
4142
RUN echo " " && \
43+
bash -c '$VENV/bin/pip install "ansible>=8,<9" && \
4244
{%- endif %}
43-
bash -c 'export VENV=/var/lib/kolla/venv && \
44-
$VENV/bin/pip install "ansible>=6,<7" && \
4545
$VENV/bin/ansible-galaxy collection install -r /bifrost/ansible-collections-requirements.yml && \
46-
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target \
46+
$VENV/bin/ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target \
4747
/bifrost/playbooks/install.yaml \
4848
-e git_branch={{ openstack_branch_slashed }} \
4949
-e ipa_upstream_release={{ openstack_branch }} \
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
upgrade:
3+
- |
4+
Ansible versions in ``bifrost-deploy`` container image have been updated
5+
to ``8`` for rpm distros and ``9`` for deb.

0 commit comments

Comments
 (0)