aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaowei <cao.wei@99cloud.net>2018-12-07 16:57:46 +0800
committerMark Goddard <mark@stackhpc.com>2018-12-13 13:55:23 +0000
commit4492fb0591a0896138646555ffa48bf49663b613 (patch)
treeae3b9f890cc4f2761efbf6fa68e9cc3f35776c28
parent32b795eeed17c3ff40b37c4235a0438b2fb86004 (diff)
downloadkolla-4492fb0591a0896138646555ffa48bf49663b613.tar.gz
kolla-4492fb0591a0896138646555ffa48bf49663b613.zip
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
-rw-r--r--docker/vitrage/vitrage-collector/Dockerfile.j230
-rw-r--r--releasenotes/notes/remove-vitrage-collector-ed76366b9bb6e8e8.yaml5
2 files changed, 5 insertions, 30 deletions
diff --git a/docker/vitrage/vitrage-collector/Dockerfile.j2 b/docker/vitrage/vitrage-collector/Dockerfile.j2
deleted file mode 100644
index 2f299b4b2..000000000
--- 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 000000000..23798c51a
--- /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.