Skip to content

Commit 081590b

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "kolla-toolbox: Bump ansible-core to 2.16"
2 parents bdb4a3c + 6efbc37 commit 081590b

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

docker/kolla-toolbox/Dockerfile.j2

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ RUN mkdir -p /requirements \
6464
ENV PATH {{ venv_path }}/bin:$PATH
6565

6666
{% set kolla_toolbox_pip_packages = [
67-
'ansible-core==2.14.*',
6867
'cmd2',
6968
'influxdb',
7069
'openstacksdk',
@@ -77,6 +76,12 @@ ENV PATH {{ venv_path }}/bin:$PATH
7776
'pyudev',
7877
] %}
7978

79+
{% if base_package_type == 'rpm' %}
80+
{% set kolla_toolbox_pip_packages = kolla_toolbox_pip_packages + ['ansible-core==2.15.*'] %}
81+
{% else %}
82+
{% set kolla_toolbox_pip_packages = kolla_toolbox_pip_packages + ['ansible-core==2.16.*'] %}
83+
{% endif %}
84+
8085
RUN {{ macros.install_pip(['pip', 'wheel', 'setuptools']) }} \
8186
&& {{ macros.install_pip(kolla_toolbox_pip_packages | customizable("pip_packages")) }} \
8287
&& mkdir -p /etc/ansible /usr/share/ansible \
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
upgrade:
3+
- |
4+
Kolla toolbox is now using ``ansible-core 2.16`` for DEB
5+
and ``ansible-core 2.15`` for RPM distros.

0 commit comments

Comments
 (0)