diff options
| -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. |