Commit caccbca0 authored by Julien Muchembled's avatar Julien Muchembled

fluentd: clean up

parent d7a6490b
{% set conf_text = slapparameter_dict.get('conf_text', '') -%}
{{ conf_text }}
\ No newline at end of file
[buildout] [buildout]
parts = parts =
directory
service-fluentd service-fluentd
fluentd-agent-conf
eggs-directory = {{ buildout['eggs-directory'] }} eggs-directory = {{ buildout['eggs-directory'] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }} develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
...@@ -32,14 +30,16 @@ recipe = slapos.cookbook:wrapper ...@@ -32,14 +30,16 @@ recipe = slapos.cookbook:wrapper
wrapper-path = ${directory:service}/fluentd-service wrapper-path = ${directory:service}/fluentd-service
command-line = {{ fluentd_location }}/bin/fluentd command-line = {{ fluentd_location }}/bin/fluentd
-v -v
-c ${directory:etc}/fluentd-agent.conf -c ${fluentd-agent-conf:rendered}
environment = environment =
GEM_PATH={{ fluentd_location }}/lib/ruby/gems/1.8/ GEM_PATH={{ fluentd_location }}/lib/ruby/gems/1.8/
[fluentd-agent-conf] [fluentd-agent-conf]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
template = {{ fluentd_conf }}/fluentd-agent.conf.jinja2.in template = inline:{% raw -%}
rendered = ${buildout:directory}/etc/fluentd-agent.conf {{ slapparameter_dict.get('conf_text', '') }}
{%- endraw %}
rendered = ${directory:etc}/fluentd-agent.conf
mode = 0644 mode = 0644
context = context =
key slapparameter_dict instance-parameter:configuration key slapparameter_dict instance-parameter:configuration
[buildout] [buildout]
extends = extends =
../../component/fluentd/buildout.cfg ../../component/fluentd/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
parts = parts =
fluentd
fluentd-agent-conf
instance-profile instance-profile
slapos-cookbook slapos-cookbook
...@@ -18,17 +15,9 @@ mode = 0644 ...@@ -18,17 +15,9 @@ mode = 0644
extensions = jinja2.ext.do extensions = jinja2.ext.do
context = context =
section buildout buildout section buildout buildout
raw fluentd_location ${fluentd:location} key fluentd_location fluentd:location
raw fluentd_conf ${buildout:directory}
[fluentd-agent-conf]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/fluentd-agent.conf.jinja2.in
#md5sum = 4b81ddcbe2f16d23013caac37151d396
output = ${buildout:directory}/fluentd-agent.conf.jinja2.in
mode = 0644
[fluentd] [fluentd]
gems += gems +=
fluent-plugin-wendelin==0.1 fluent-plugin-wendelin==0.1
fluent-plugin-bin fluent-plugin-bin
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment