openstack
/
kolla
Code Issues Proposed changes

Merge "gnocchi: do not install cradox"

This commit is contained in:
Zuul 2021-11-02 18:05:11 +00:00 committed by Gerrit Code Review
parent b8d1a62df6 1b41f2e682
commit eec025cfe1
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -23,7 +23,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-boto3',
'python3-rados',
] %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
{% set gnocchi_base_packages = [
@ -36,14 +35,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-setuptools',
'python3-wheel'
] %}
{% set gnocchi_base_pip_packages = [
'cradox'
] %}
{% endif %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false) }}
{% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}