diff options
| author | Zuul <zuul@review.openstack.org> | 2018-12-17 18:48:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-12-17 18:48:54 +0000 |
| commit | b4dd65ba1c7ebb8720cdcab04f4cebfff2a6e6c6 (patch) | |
| tree | 869d4a1ed9d4add69dcd36b3ac2681be31c43d34 | |
| parent | 3a44481f22975b7826871c8d86df5bb7f1f91d55 (diff) | |
| parent | 4492fb0591a0896138646555ffa48bf49663b613 (diff) | |
| download | kolla-b4dd65ba1c7ebb8720cdcab04f4cebfff2a6e6c6.tar.gz kolla-b4dd65ba1c7ebb8720cdcab04f4cebfff2a6e6c6.zip | |
Merge "Complete removal of vitrage-collector service."
| -rw-r--r-- | docker/vitrage/vitrage-collector/Dockerfile.j2 | 30 | ||||
| -rw-r--r-- | releasenotes/notes/remove-vitrage-collector-ed76366b9bb6e8e8.yaml | 5 |
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. |