diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-01 13:41:14 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org> | 2022-04-09 17:44:26 +0200 |
| commit | 1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (patch) | |
| tree | 05427aa46ce6473684cfe2a824798306291546c9 /docker/ceilometer/ceilometer-compute | |
| parent | cabfd0f3eff38e2c10cdc7cf4e9271d72eeca91a (diff) | |
| download | kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.tar.gz kolla-1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e.zip | |
docker: drop binary parts
Big patch drops all mentions of binary images support. Suggestions are
welcome how to split it into parts or handle better.
Change-Id: I5d5a46c6ce7734ceb8b844e17b43e359d7cac6e3
Diffstat (limited to 'docker/ceilometer/ceilometer-compute')
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index e63d253b3..8421ab8ad 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -9,29 +9,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.enable_extra_repos(['libvirt']) }} -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set ceilometer_compute_packages = [ - 'openstack-ceilometer-compute', - ] %} - {% elif base_package_type == 'deb' %} - {% set ceilometer_compute_packages = [ - 'ceilometer-agent-compute', - 'python3-libvirt' - ] %} - {% endif %} -{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }} - -{% elif install_type == 'source' %} - {% if base_package_type == 'rpm' %} - {% set ceilometer_compute_packages = [ - 'python3-libvirt' - ] %} - {% elif base_package_type == 'deb' %} - {% set ceilometer_compute_packages = [ - 'python3-libvirt' - ] %} - {% endif %} +{% if base_package_type == 'rpm' %} + {% set ceilometer_compute_packages = [ + 'python3-libvirt' + ] %} +{% elif base_package_type == 'deb' %} + {% set ceilometer_compute_packages = [ + 'python3-libvirt' + ] %} +{% endif %} {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }} @@ -40,8 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build RUN {{ macros.install_pip(ceilometer_compute_pip_packages | customizable("pip_packages")) }} -{% endif %} - {% block ceilometer_compute_footer %}{% endblock %} {% block footer %}{% endblock %} |