From caccbca0079ec794acd0abc66c3cf90dcf304f11 Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Wed, 21 Jun 2017 17:20:37 +0200
Subject: [PATCH] fluentd: clean up

---
 software/fluentd/fluentd-agent.conf.jinja2.in |  2 --
 software/fluentd/instance.cfg.in              | 14 +++++++-------
 software/fluentd/software.cfg                 | 17 +++--------------
 3 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 software/fluentd/fluentd-agent.conf.jinja2.in

diff --git a/software/fluentd/fluentd-agent.conf.jinja2.in b/software/fluentd/fluentd-agent.conf.jinja2.in
deleted file mode 100644
index 9b01f61244..0000000000
--- a/software/fluentd/fluentd-agent.conf.jinja2.in
+++ /dev/null
@@ -1,2 +0,0 @@
-{% set conf_text = slapparameter_dict.get('conf_text', '')  -%}
-{{ conf_text }}
\ No newline at end of file
diff --git a/software/fluentd/instance.cfg.in b/software/fluentd/instance.cfg.in
index a464c1280f..fcb4d6bbc6 100644
--- a/software/fluentd/instance.cfg.in
+++ b/software/fluentd/instance.cfg.in
@@ -1,8 +1,6 @@
 [buildout]
 parts =
-  directory
   service-fluentd
-  fluentd-agent-conf
 
 eggs-directory = {{ buildout['eggs-directory'] }}
 develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
@@ -32,14 +30,16 @@ recipe  = slapos.cookbook:wrapper
 wrapper-path    = ${directory:service}/fluentd-service
 command-line    = {{ fluentd_location }}/bin/fluentd
     -v
-    -c ${directory:etc}/fluentd-agent.conf
-environment = 
+    -c ${fluentd-agent-conf:rendered}
+environment =
   GEM_PATH={{ fluentd_location }}/lib/ruby/gems/1.8/
 
 [fluentd-agent-conf]
 recipe  = slapos.recipe.template:jinja2
-template = {{ fluentd_conf }}/fluentd-agent.conf.jinja2.in
-rendered = ${buildout:directory}/etc/fluentd-agent.conf
+template = inline:{% raw -%}
+  {{ slapparameter_dict.get('conf_text', '') }}
+  {%- endraw %}
+rendered = ${directory:etc}/fluentd-agent.conf
 mode = 0644
-context = 
+context =
   key slapparameter_dict instance-parameter:configuration
diff --git a/software/fluentd/software.cfg b/software/fluentd/software.cfg
index fb09510b9d..a788a894bb 100644
--- a/software/fluentd/software.cfg
+++ b/software/fluentd/software.cfg
@@ -1,12 +1,9 @@
 [buildout]
-
 extends =
   ../../component/fluentd/buildout.cfg
   ../../stack/slapos.cfg
 
-parts = 
-  fluentd
-  fluentd-agent-conf
+parts =
   instance-profile
   slapos-cookbook
 
@@ -18,17 +15,9 @@ mode = 0644
 extensions = jinja2.ext.do
 context =
   section buildout  buildout
-  raw 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
+  key fluentd_location fluentd:location
 
 [fluentd]
-gems += 
+gems +=
   fluent-plugin-wendelin==0.1
   fluent-plugin-bin
-- 
2.25.1