From 9ebd3bcfd55b9e172f71a6863dbc0f4aeb8c3ea6 Mon Sep 17 00:00:00 2001 From: Jeffrey Zhang Date: Thu, 28 Dec 2017 12:44:13 +0800 Subject: Remove ceilometer-collector image ceilometer collector is remove from ceilometer code base[1] [1] https://review.openstack.org/504244 Change-Id: Id15d4d881b0fddcbc5e3f6afd6221a49e15ae704 --- .../ceilometer/ceilometer-collector/Dockerfile.j2 | 22 ---------------------- ...eilometer-collector-image-c5d1c4b6463b2ecd.yaml | 4 ++++ 2 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 docker/ceilometer/ceilometer-collector/Dockerfile.j2 create mode 100644 releasenotes/notes/remove-ceilometer-collector-image-c5d1c4b6463b2ecd.yaml 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. -- cgit v1.2.3