Merge "Add rsyslog image"

This commit is contained in:
Zuul 2017-10-26 04:02:27 +00:00 committed by Gerrit Code Review
commit 0ef29af547
3 changed files with 30 additions and 0 deletions

View File

@ -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 %}

View File

@ -74,6 +74,7 @@ _PROFILE_OPTS = [
'qdrouterd',
'rabbitmq',
'redis',
'rsyslog',
'skydive',
'tgtd',
],

View File

@ -0,0 +1,4 @@
---
features:
- |
Add Rsyslog image.