From 4492fb0591a0896138646555ffa48bf49663b613 Mon Sep 17 00:00:00 2001 From: caowei Date: Fri, 7 Dec 2018 16:57:46 +0800 Subject: [PATCH] Complete removal of vitrage-collector service. Reference: https://docs.openstack.org/releasenotes/vitrage/unreleased.html#relnotes-3-1-0-37 Closes-Bug: #1807349 Change-Id: I625abab383774b01ccb95e6010d41bce4e2cb1a6 --- .../vitrage/vitrage-collector/Dockerfile.j2 | 30 ------------------- ...ve-vitrage-collector-ed76366b9bb6e8e8.yaml | 5 ++++ 2 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 docker/vitrage/vitrage-collector/Dockerfile.j2 create mode 100644 releasenotes/notes/remove-vitrage-collector-ed76366b9bb6e8e8.yaml diff --git a/docker/vitrage/vitrage-collector/Dockerfile.j2 b/docker/vitrage/vitrage-collector/Dockerfile.j2 deleted file mode 100644 index 2f299b4b2a..0000000000 --- a/docker/vitrage/vitrage-collector/Dockerfile.j2 +++ /dev/null @@ -1,30 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}vitrage-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block vitrage_collector_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% if install_type == 'binary' %} - - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - - {% set vitrage_collector_packages = [ - 'openstack-vitrage-collector' - ] %} - -{{ macros.install_packages(vitrage_collector_packages | customizable("packages")) }} - - {% elif base_distro in ['debian', 'ubuntu'] %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - - {% endif %} - -{% endif %} - -{% block vitrage_collector_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER vitrage diff --git a/releasenotes/notes/remove-vitrage-collector-ed76366b9bb6e8e8.yaml b/releasenotes/notes/remove-vitrage-collector-ed76366b9bb6e8e8.yaml new file mode 100644 index 0000000000..23798c51ac --- /dev/null +++ b/releasenotes/notes/remove-vitrage-collector-ed76366b9bb6e8e8.yaml @@ -0,0 +1,5 @@ +--- +deprecations: + - | + The ``vitrage-collector`` service has been removed by the Vitrage project, + so the ``vitrage-collector`` image has been removed from Kolla.