openstack/kolla
Code Issues Proposed changes

Merge "kolla-toolbox: Bump ansible-core to 2.16"

Browse Source
This commit is contained in:
Zuul 2024-04-17 12:25:13 +00:00 committed by Gerrit Code Review
commit 081590b63b
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/kolla-toolbox/Dockerfile.j2
View File

@ -64,7 +64,6 @@ RUN mkdir -p /requirements \
ENV PATH {{ venv_path }}/bin:$PATH ENV PATH {{ venv_path }}/bin:$PATH
{% set kolla_toolbox_pip_packages = [ {% set kolla_toolbox_pip_packages = [
'ansible-core==2.14.*',
'cmd2', 'cmd2',
'influxdb', 'influxdb',
'openstacksdk', 'openstacksdk',
@ -77,6 +76,12 @@ ENV PATH {{ venv_path }}/bin:$PATH
'pyudev', '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']) }} \ RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \
&& {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \ && {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/ansible /usr/share/ansible \ && mkdir -p /etc/ansible /usr/share/ansible \

5
releasenotes/notes/ansible-core-2_16-toolbox-8cec8f56e022731b.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Kolla toolbox is now using ``ansible-core 2.16`` for DEB
and ``ansible-core 2.15`` for RPM distros.