Merge lp:~cprov/charms/trusty/logstash/fix-config into lp:~tanuki/charms/trusty/logstash/trunk

Proposed by Celso Providelo on 2015-08-14
Status: Merged
Merged at revision: 52
Proposed branch: lp:~cprov/charms/trusty/logstash/fix-config
Merge into: lp:~tanuki/charms/trusty/logstash/trunk
Diff against target: 15 lines (+2/-2)
1 file modified
hooks/config-changed (+2/-2)
To merge this branch: bzr merge lp:~cprov/charms/trusty/logstash/fix-config
Reviewer Review Type Date Requested Status
Guillermo Gonzalez 2015-08-14 Approve on 2015-08-14
Review via email:

Commit message

Fixing extra-config config value lookup.

Description of the change

Fixing extra-config config value lookup.

To post a comment you must log in.
Guillermo Gonzalez (verterok) wrote :


review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/config-changed'
--- hooks/config-changed 2015-08-14 13:08:08 +0000
+++ hooks/config-changed 2015-08-14 15:09:40 +0000
@@ -66,9 +66,9 @@
66 config_data = hookenv.config()66 config_data = hookenv.config()
68 # Write custom configuration if set.68 # Write custom configuration if set.
69 if config_data['extra_config']:69 if config_data['extra-config']:
70 with open(os.path.join(BASEPATH, 'conf.d', 'extra.conf'), 'w') as f:70 with open(os.path.join(BASEPATH, 'conf.d', 'extra.conf'), 'w') as f:
71 f.write(str(base64.b64decode(config_data['extra_config'])))71 f.write(str(base64.b64decode(config_data['extra-config'])))
73 # Only setup lumberjack protocol if ssl cert and key are configured73 # Only setup lumberjack protocol if ssl cert and key are configured
74 if config_data['ssl_cert'] and config_data['ssl_key']:74 if config_data['ssl_cert'] and config_data['ssl_key']:


People subscribed via source and target branches

to all changes: