diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2025-09-09 21:08:10 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2025-10-28 10:45:51 +0000 |
| commit | 3913b6229510788f019b90d0011cc1a372cd57e7 (patch) | |
| tree | 2fd4052783c62c05e77ec78ce940fb9df47c9875 | |
| parent | cde2df1beba5f2ac0a6e51198f7cfa8ef557b86c (diff) | |
| download | kolla-3913b6229510788f019b90d0011cc1a372cd57e7.tar.gz kolla-3913b6229510788f019b90d0011cc1a372cd57e7.zip | |
Bump Ansible to 12 and ansible-core to 2.19
Change-Id: I37f4515587cb040296612e35d4c643f0c2bea6f6
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index dc62aaf2a..e31a12b32 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -67,7 +67,7 @@ RUN apt-get --error-on=any update && \ {%- else %} RUN echo " " && \ {%- endif %} - bash -c '$VENV/bin/pip install "ansible>=11,<12" && \ + bash -c '$VENV/bin/pip install "ansible>=12,<13" && \ $VENV/bin/ansible-galaxy collection install -r /bifrost/ansible-collections-requirements.yml && \ $VENV/bin/ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target \ /bifrost/playbooks/install.yaml \ diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index b53b45da2..9f97ed386 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -96,7 +96,7 @@ RUN mkdir -p /requirements \ ENV PATH {{ venv_path }}/bin:$PATH {% set kolla_toolbox_pip_packages = [ - 'ansible-core==2.18.*', + 'ansible-core==2.19.*', 'cmd2', 'influxdb', 'openstacksdk', diff --git a/test-requirements.txt b/test-requirements.txt index 30c980fb3..7e3178bd6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,6 @@ -ansible-core>=2.17,<2.19 # GPLv3 +# NOTE(mnasiadka): Keeping 2.17 to satisfy py310 job +ansible-core>=2.17; python_version < '3.11' # GPLv3 +ansible-core>=2.18,<2.20; python_version >= '3.11' # GPLv3 ansible-lint<26 # MIT bandit!=1.6.0,>=1.1.0 # Apache-2.0 bashate>=0.5.1 # Apache-2.0 |