diff options
| author | Zuul <zuul@review.openstack.org> | 2017-10-26 04:02:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-10-26 04:02:27 +0000 |
| commit | 0ef29af547809bf926d3d93e090bbc11a6c3c028 (patch) | |
| tree | d39cf3ed7400c80dd4ffec10a99852ed91f4b86a | |
| parent | 1d90ff347a7f05abdd80724d65655a6563624092 (diff) | |
| parent | 7dadabf52b2be5208b960390c44065eca56b9dc7 (diff) | |
| download | kolla-0ef29af547809bf926d3d93e090bbc11a6c3c028.tar.gz kolla-0ef29af547809bf926d3d93e090bbc11a6c3c028.zip | |
Merge "Add rsyslog image"
| -rw-r--r-- | docker/rsyslog/Dockerfile.j2 | 25 | ||||
| -rwxr-xr-x | kolla/common/config.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/rsyslog-13d5798163953322.yaml | 4 |
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. |