aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2024-07-16 17:55:39 +0200
committerMichal Nasiadka <mnasiadka@gmail.com>2024-08-23 13:57:31 +0000
commitcd26b72658cca7413b1f359985314a12ec194583 (patch)
tree33f59faebd7f03fd4ceb4694f1bd00e80ca5ea92
parent29fc6a8bc27e9a588a19d16e1a33a63a5e6c5c5a (diff)
downloadkolla-cd26b72658cca7413b1f359985314a12ec194583.tar.gz
kolla-cd26b72658cca7413b1f359985314a12ec194583.zip
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
-rw-r--r--docker/bifrost/bifrost-base/Dockerfile.j26
-rw-r--r--releasenotes/notes/bifrost-ansible-9-10-3a33e95f42713209.yaml5
2 files changed, 8 insertions, 3 deletions
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 }} \
diff --git a/releasenotes/notes/bifrost-ansible-9-10-3a33e95f42713209.yaml b/releasenotes/notes/bifrost-ansible-9-10-3a33e95f42713209.yaml
new file mode 100644
index 000000000..bdc892344
--- /dev/null
+++ b/releasenotes/notes/bifrost-ansible-9-10-3a33e95f42713209.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ Ansible versions in ``bifrost-deploy`` container image have been updated
+ to ``8`` for rpm distros and ``9`` for deb.