Merge lp:~verterok/charms/trusty/telegraf/fix-influxdb-template into lp:~ubuntuone-hackers/charms/trusty/telegraf/trunk

[Guillermo Gonzalez]

fix influxdb-api hook to include extra options

fix influxdb-api hook to include extra options

[Guillermo Gonzalez (verterok)]

trivial

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2016-03-30 17:57:57 +0000
+++ hooks/actions.py	2016-04-01 14:20:08 +0000
@@ -304,10 +304,13 @@
                 password = rel['password']
     config_path = '{}/{}.conf'.format(CONFIG_DIR, 'influxdb-api')
     if endpoints:
-        hookenv.log("Updating {} plugin config file".format('postgresql'))
-        render(source='influxdb-api.conf.tmpl', target=config_path,
-               context={'urls': json.dumps(endpoints),
-                        'username': '{}'.format(user),
-                        'password': '{}'.format(password)})
+        hookenv.log("Updating {} plugin config file".format('influxdb-api'))
+        content = render(source='influxdb-api.conf.tmpl', target=None,
+                         context={'urls': json.dumps(endpoints),
+                                  'username': '{}'.format(user),
+                                  'password': '{}'.format(password)})
+        extra_opts = render_extra_options("outputs", "influxdb")
+        host.write_file(config_path, '\n'.join([content, extra_opts]))
     elif os.path.exists(config_path):
         os.unlink(config_path)
+