aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/ceilometer/ceilometer-collector/Dockerfile.j222
-rw-r--r--releasenotes/notes/remove-ceilometer-collector-image-c5d1c4b6463b2ecd.yaml4
2 files changed, 4 insertions, 22 deletions
diff --git a/docker/ceilometer/ceilometer-collector/Dockerfile.j2 b/docker/ceilometer/ceilometer-collector/Dockerfile.j2
deleted file mode 100644
index 9a7f3dc2e..000000000
--- a/docker/ceilometer/ceilometer-collector/Dockerfile.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-
-{% block ceilometer_collector_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
- {% set ceilometer_collector_packages = ['openstack-ceilometer-collector'] %}
- {% elif base_distro in ['debian', 'ubuntu'] %}
- {% set ceilometer_collector_packages = ['ceilometer-collector'] %}
- {% endif %}
-
-{{ macros.install_packages(ceilometer_collector_packages | customizable("packages")) }}
-
-{% endif %}
-
-{% block ceilometer_collector_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER ceilometer
diff --git a/releasenotes/notes/remove-ceilometer-collector-image-c5d1c4b6463b2ecd.yaml b/releasenotes/notes/remove-ceilometer-collector-image-c5d1c4b6463b2ecd.yaml
new file mode 100644
index 000000000..278d1668d
--- /dev/null
+++ b/releasenotes/notes/remove-ceilometer-collector-image-c5d1c4b6463b2ecd.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+ - remove ceilometer-collector image, as it is removed from ceilometer code
+ base.