Remove rsyslog image

Signed-off-by: Christian Berendt <berendt@betacloud-solutions.de>
Change-Id: I02f502c62d488d3822eb6008a77c88633e41e2b9

6 files changed, 3 insertions, 45 deletions

diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 614aecc96..e3d4e2bd0 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -66,7 +66,6 @@ rabbitmq,C,C,C,C,N,C
 radvd (deprecated),C,C,C,C,N,C
 rally,C,C,N,C,N,C
 redis,C,C,C,C,N,C
-rsyslog (deprecated),C,C,C,C,N,C
 sahara,C,C,C,C,N,C
 senlin,C,C,C,C,N,C
 skydive,N,N,N,N,N,N
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 969320d43..4d578555f 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -67,7 +67,6 @@ rabbitmq,T,T,T,T,C,T
 radvd (deprecated),C,C,C,C,C,C
 rally,C,C,N,C,C,C
 redis,C,T,C,C,C,C
-rsyslog (deprecated),C,C,C,C,C,C
 sahara,C,C,C,C,C,C
 senlin,C,C,C,C,C,C
 skydive,C,C,C,C,C,C
diff --git a/docker/rsyslog/rsyslog-base/Dockerfile.j2 b/docker/rsyslog/rsyslog-base/Dockerfile.j2
deleted file mode 100644
index 6689e86f8..000000000
--- a/docker/rsyslog/rsyslog-base/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block rsyslog_base_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% set rsyslog_base_packages = [
-    'rsyslog'
-] %}
-
-{{ macros.install_packages(rsyslog_base_packages | customizable("packages")) }}
-
-{% block rsyslog_base_footer %}{% endblock %}
diff --git a/docker/rsyslog/rsyslog/Dockerfile.j2 b/docker/rsyslog/rsyslog/Dockerfile.j2
deleted file mode 100644
index 5003c2b00..000000000
--- a/docker/rsyslog/rsyslog/Dockerfile.j2
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM {{ namespace }}/{{ infra_image_prefix }}rsyslog-base:{{ tag }}
-{% block labels %}
-LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
-{% endblock %}
-
-{% block rsyslog_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if base_package_type == 'rpm' %}
-    {% set rsyslog_packages = [
-        'rsyslog-elasticsearch',
-        'rsyslog-gnutls',
-        'rsyslog-mmjsonparse',
-        'rsyslog-mmnormalize'
-    ] %}
-{% elif base_package_type == 'deb' %}
-    {% set rsyslog_packages = [
-        'rsyslog-gnutls'
-    ] %}
-{% endif %}
-
-{{ macros.install_packages(rsyslog_packages | customizable("packages")) }}
-
-{% block rsyslog_footer %}{% endblock %}
-{% block footer %}{% endblock %}
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 9c077c6d0..4dfbff52e 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -68,7 +68,6 @@ _PROFILE_OPTS = [
                     'qdrouterd',
                     'rabbitmq',
                     'redis',
-                    'rsyslog',
                     'skydive',
                     'storm',
                     'tgtd',
diff --git a/releasenotes/notes/remove-rsyslog-image-c5ab6cade15e478e.yaml b/releasenotes/notes/remove-rsyslog-image-c5ab6cade15e478e.yaml
new file mode 100644
index 000000000..6d70f6d1f
--- /dev/null
+++ b/releasenotes/notes/remove-rsyslog-image-c5ab6cade15e478e.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - The ``rsyslog`` image is removed per the deprecation cycle.