aboutsummaryrefslogtreecommitdiff
path: root/docker/ceilometer/ceilometer-compute
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-11 09:39:28 +0000
committerGerrit Code Review <review@openstack.org>2022-04-11 09:39:28 +0000
commit657820362dd0b52f8462054e043fd892d14fbe76 (patch)
treed2675f8f172c08febc6f1eaf9900deec7b43c8ee /docker/ceilometer/ceilometer-compute
parent26fd382f176adbc104850f565df238253d8f9fc7 (diff)
parent1749da2fbf6b395b1a2cd77f349e0bea5d2f4a5e (diff)
downloadkolla-657820362dd0b52f8462054e043fd892d14fbe76.tar.gz
kolla-657820362dd0b52f8462054e043fd892d14fbe76.zip
Merge "docker: drop binary parts"
Diffstat (limited to 'docker/ceilometer/ceilometer-compute')
-rw-r--r--docker/ceilometer/ceilometer-compute/Dockerfile.j234
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 %}