Fix formatting in python plugin template

[ttarczynski]

Fix for: #281

[ttarczynski]

The failed tests show that the python module should be used with the double quotes included in parameters values:

  context 'spam module' do
    let(:title) { 'spam' }
    let :params do
      { 
        :config     => { 'spam' => '"wonderful" "lovely"' },
        :modulepath => '/var/lib/collectd/python',
      }
    end

      should contain_concat__fragment('collectd_plugin_python_conf_spam').with({
        :content => /spam "wonderful" "lovely"/,
      })

---

I think this behavior has changed since version 3.3.0 and it would help if we have a note in the documentation.
Should I revert the double quotes change? Then I would only add new lines after each param and a short note in docs about the quotes.

[blkperl]

@deric or @arioch Did your recent PR break this?

So is this a difference between versions of collectd then?

[ttarczynski]

I think collectd configuration syntax hasn't changed.
I've meant a change in puppet-module-collectd between version 3.3.0 and 3.4.0

The rspec code (collectd_plugin_python_module_spec.rb) shows configuration similar to the man page example: collectd-python. But there is the missing newlines issue (#281)

[deric]

Nope, that wasn't me. The line ending was removed in #267.

[arioch]

#267 fixed not getting any python based data. It's still happily running in production over here.

[deric]

Be careful, this doesn't check if string is already quoted. Have a look at the specs.

[deric]

Should be replaced by <% end %> if you don't wanna re-introduce #267.

[ttarczynski]

I think #267 was caused by a missing newline after </Module>

[deric]

@arioch sure, but removing line endings after key-value pair (<%= key -%> <%= value -%>) wasn't necessary.

[ttarczynski]

I'm not sure if I'm using the pull request correctly. I've just added another commit, to change only newlines (and not quotes).

@arioch @deric I think the code on master works ok for a single parameter in Module block, but it doesn't for multiple params, e.g. #281

[deric]

Please replace this by <% end %>, otherwise there won't be new line between multiple modules.

[ttarczynski]

Just tested with multiple modules.
It results with config file:

# Generated by Puppet
<Plugin "python">
  ModulePath "/usr/lib64/collectd"
  LogTraces false
  Interactive false

  Import "elasticsearch"

  <Module "elasticsearch">
    Cluster test
    Verbose false
    Version 1.0
  </Module>

  Import "rabbitmq"

  <Module "rabbitmq">
    Host "localhost"
    Password "ppp"
    Port "15672"
    PrefixVhost true
    Realm "RabbitMQ Management"
    Username "uuu"
  </Module>

</Plugin>

I think newlines between modules looks ok here.
It's done with ensure_newline used in manifests/plugin/python.pp
and #267 fixed missing newline at the end of file: pull/267/files

[ttarczynski]

@deric when I replace <%- end -%> by <% end %> I get extra (not needed) new line before </Module> and wrong indentation in the <Module> block:

Notice: /Stage[main]/Collectd::Plugin::Python/Concat[/etc/collectd.d/python-config.conf]/File[/etc/collectd.d/python-config.conf]/content: 
--- /etc/collectd.d/python-config.conf  2015-06-30 09:45:40.752012515 +0200
+++ /tmp/puppet-file20150703-10516-16ym6qz-0    2015-07-03 08:50:02.977012923 +0200
@@ -8,19 +8,21 @@

   <Module "elasticsearch">
     Cluster opslogstash
-    Verbose false
-    Version 1.0
+      Verbose false
+      Version 1.0
+  
   </Module>

   Import "rabbitmq"

   <Module "rabbitmq">
     Host "localhost"
-    Password "ppp"
-    Port "15672"
-    PrefixVhost true
-    Realm "RabbitMQ Management"
-    Username "uuu"
+      Password "ppp"
+      Port "15672"
+      PrefixVhost true
+      Realm "RabbitMQ Management"
+      Username "uuu"
+  
   </Module>

 </Plugin>

[deric]

Ok, cool. Thanks for debugging this.

[blkperl]

So is this ready to be merged then?

[deric]

Yeah, good to merge. I've tested this on a configuration with multiple python modules. Indentation and new lines works fine. Tested on puppet 3.8.1