diff options
| author | Zuul <zuul@review.opendev.org> | 2022-04-11 09:39:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-04-11 09:39:28 +0000 |
| commit | 657820362dd0b52f8462054e043fd892d14fbe76 (patch) | |
| tree | d2675f8f172c08febc6f1eaf9900deec7b43c8ee /docker/ceilometer/ceilometer-base | |
| parent | 26fd382f176adbc104850f565df238253d8f9fc7 (diff) | |
| parent | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (diff) | |
| download | kolla-657820362dd0b52f8462054e043fd892d14fbe76.tar.gz kolla-657820362dd0b52f8462054e043fd892d14fbe76.zip | |
Merge "docker: drop binary parts"
Diffstat (limited to 'docker/ceilometer/ceilometer-base')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 0edcf2dc1..31931d148 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -9,25 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='ceilometer') }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set ceilometer_base_packages = [ - 'openstack-ceilometer-common', - 'python3-gnocchiclient', - 'python3-oslo-db', - 'python3-tooz' - ] %} - {% elif base_package_type == 'deb' %} - {% set ceilometer_base_packages = [ - 'ceilometer-common', - 'python3-gnocchiclient', - ] %} - {% endif %} - -{{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% set ceilometer_base_pip_packages = [ '/ceilometer' ] %} @@ -50,8 +31,6 @@ RUN ln -s ceilometer-base-source/* ceilometer \ {{ macros.install_pip(ceilometer_base_plugins_pip_packages) }}; \ fi -{% endif %} - COPY ceilometer_sudoers /etc/sudoers.d/kolla_ceilometer_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start |