diff options
| author | Zuul <zuul@review.opendev.org> | 2024-04-17 12:25:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-04-17 12:25:13 +0000 |
| commit | 081590b63b6f2c4935d89915509f8240219c0361 (patch) | |
| tree | 25c4cdfe16375d850c31efa7605e061bd9fe8b7e /docker | |
| parent | bdb4a3ccdbf82ee7d933bff9e8ccde62a29c8941 (diff) | |
| parent | 6efbc371f0b42daf846590bb3017711203d01d5a (diff) | |
| download | kolla-081590b63b6f2c4935d89915509f8240219c0361.tar.gz kolla-081590b63b6f2c4935d89915509f8240219c0361.zip | |
Merge "kolla-toolbox: Bump ansible-core to 2.16"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 7 |
1 files changed, 6 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 \ |