diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2024-03-29 08:23:43 +0100 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2024-04-17 06:20:36 +0000 |
| commit | 6efbc371f0b42daf846590bb3017711203d01d5a (patch) | |
| tree | 085c16f9f5f5259184eb8f6beefe318ada327674 | |
| parent | 3e502dc34dd4bd2b643c8131839d2853d855171d (diff) | |
| download | kolla-6efbc371f0b42daf846590bb3017711203d01d5a.tar.gz kolla-6efbc371f0b42daf846590bb3017711203d01d5a.zip | |
kolla-toolbox: Bump ansible-core to 2.16
2.15 patch was 2023.2 only - because we missed it last cycle [1]
ansible-core 2.16 requires python3.10 which is not the default
python in Rocky Linux 9 - therefore we use 2.15 there for now
[1]: https://review.opendev.org/c/openstack/kolla/+/910148
Change-Id: Ic8cc29230d82f4d1f07a3c97c3dcbcd14ac76074
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | releasenotes/notes/ansible-core-2_16-toolbox-8cec8f56e022731b.yaml | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index c5e17a20e..767168a45 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -64,7 +64,6 @@ RUN mkdir -p /requirements \ ENV PATH {{ venv_path }}/bin:$PATH {% set kolla_toolbox_pip_packages = [ - 'ansible-core==2.14.*', 'cmd2', 'influxdb', 'openstacksdk', @@ -77,6 +76,12 @@ ENV PATH {{ venv_path }}/bin:$PATH 'pyudev', ] %} +{% if base_package_type == 'rpm' %} +{% set kolla_toolbox_pip_packages = kolla_toolbox_pip_packages + ['ansible-core==2.15.*'] %} +{% else %} +{% set kolla_toolbox_pip_packages = kolla_toolbox_pip_packages + ['ansible-core==2.16.*'] %} +{% endif %} + RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \ && {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/ansible /usr/share/ansible \ diff --git a/releasenotes/notes/ansible-core-2_16-toolbox-8cec8f56e022731b.yaml b/releasenotes/notes/ansible-core-2_16-toolbox-8cec8f56e022731b.yaml new file mode 100644 index 000000000..cfbe2dbb0 --- /dev/null +++ b/releasenotes/notes/ansible-core-2_16-toolbox-8cec8f56e022731b.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Kolla toolbox is now using ``ansible-core 2.16`` for DEB + and ``ansible-core 2.15`` for RPM distros. |