diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-02 18:05:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-02 18:05:11 +0000 |
| commit | eec025cfe15f780a1bd0b6afed223229a5c28b78 (patch) | |
| tree | 0ec892ad3de9eb4ab3eeee2fcd6fbbfcf7845023 /docker | |
| parent | b8d1a62df61382b6a5d5585c9e2d5efe5c929154 (diff) | |
| parent | 1b41f2e682f15dd5f3eb0fb09d61c35f18607bb8 (diff) | |
| download | kolla-eec025cfe15f780a1bd0b6afed223229a5c28b78.tar.gz kolla-eec025cfe15f780a1bd0b6afed223229a5c28b78.zip | |
Merge "gnocchi: do not install cradox"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/gnocchi/gnocchi-base/Dockerfile.j2 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/docker/gnocchi/gnocchi-base/Dockerfile.j2 b/docker/gnocchi/gnocchi-base/Dockerfile.j2 index 437cb9153..0b68c34f9 100644 --- a/docker/gnocchi/gnocchi-base/Dockerfile.j2 +++ b/docker/gnocchi/gnocchi-base/Dockerfile.j2 @@ -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' %} |