diff options
| author | Zuul <zuul@review.opendev.org> | 2024-08-23 17:09:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-08-23 17:09:51 +0000 |
| commit | ccb13b672d4a178fefa624b8ab5b214a0bec7e45 (patch) | |
| tree | f12c952a6025cc0cf4e7ed10a8c5d50140f7cf91 /docker | |
| parent | 26f9d8f5803e1686c63faa2ea577288c61d0d486 (diff) | |
| parent | cd26b72658cca7413b1f359985314a12ec194583 (diff) | |
| download | kolla-ccb13b672d4a178fefa624b8ab5b214a0bec7e45.tar.gz kolla-ccb13b672d4a178fefa624b8ab5b214a0bec7e45.zip | |
Merge "bifrost: bump Ansible version to 8 (rpm) and 9 (deb)"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 6 |
1 files changed, 3 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 }} \ |