aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-10-24 15:24:24 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-10-24 15:25:38 +0300
commit7dadabf52b2be5208b960390c44065eca56b9dc7 (patch)
treed09bc95c903ddd64f4b3015b7de09f04c403bcb2
parent2c3671b27e138658bf5ae40580ff56c5ecc9540b (diff)
downloadkolla-7dadabf52b2be5208b960390c44065eca56b9dc7.tar.gz
kolla-7dadabf52b2be5208b960390c44065eca56b9dc7.zip
Add rsyslog image
This adds a basic rsyslog image with TLS support. For CentOS, we need to specify the addition of the log normalizer and json parsing modules; this is not necessary for debian based systems as they're part of the base rsyslog package. Change-Id: Ic40cbdaa182fa664c2329e0336259566307165d4
-rw-r--r--docker/rsyslog/Dockerfile.j225
-rwxr-xr-xkolla/common/config.py1
-rw-r--r--releasenotes/notes/rsyslog-13d5798163953322.yaml4
3 files changed, 30 insertions, 0 deletions
diff --git a/docker/rsyslog/Dockerfile.j2 b/docker/rsyslog/Dockerfile.j2
new file mode 100644
index 000000000..60d489b1e
--- /dev/null
+++ b/docker/rsyslog/Dockerfile.j2
@@ -0,0 +1,25 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block rsyslog_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+ {% set rsyslog_packages = [
+ 'rsyslog',
+ 'rsyslog-gnutls',
+ 'rsyslog-mmjsonparse',
+ 'rsyslog-mmnormalize',
+ ] %}
+{% elif base_distro in ['debian', 'ubuntu'] %}
+ {% set rsyslog_packages = [
+ 'rsyslog',
+ '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 e12a7ad08..3b650ca1c 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -74,6 +74,7 @@ _PROFILE_OPTS = [
'qdrouterd',
'rabbitmq',
'redis',
+ 'rsyslog',
'skydive',
'tgtd',
],
diff --git a/releasenotes/notes/rsyslog-13d5798163953322.yaml b/releasenotes/notes/rsyslog-13d5798163953322.yaml
new file mode 100644
index 000000000..48128ada7
--- /dev/null
+++ b/releasenotes/notes/rsyslog-13d5798163953322.yaml
@@ -0,0 +1,4 @@
+---
+features:
+ - |
+ Add Rsyslog image.