Merge lp:~verterok/charms/trusty/logstash/disable-install-on-config-change into lp:~tanuki/charms/trusty/logstash/trunk

Proposed by Guillermo Gonzalez
Status: Merged
Merged at revision: 49
Proposed branch: lp:~verterok/charms/trusty/logstash/disable-install-on-config-change
Merge into: lp:~tanuki/charms/trusty/logstash/trunk
Diff against target: 14 lines (+3/-1)
1 file modified
hooks/config-changed (+3/-1)
To merge this branch: bzr merge lp:~verterok/charms/trusty/logstash/disable-install-on-config-change
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
Review via email: mp+266880@code.launchpad.net

Commit message

Disable call of install hook from config-changed, as it fails if the tarball was already installed/extracted

Description of the change

Disable call of install hook from config-changed, as it fails if the tarball was already installed/extracted

To post a comment you must log in.
Revision history for this message
Celso Providelo (cprov) :
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-06-30 16:42:53 +0000
+++ hooks/config-changed 2015-08-04 14:12:41 +0000
@@ -41,7 +41,9 @@
41 hookenv.open_port(5959, protocol='UDP')41 hookenv.open_port(5959, protocol='UDP')
4242
43 # The install hook is idempotent, so re-run it.43 # The install hook is idempotent, so re-run it.
44 subprocess.check_output(shlex.split('hooks/install'))44 # XXX: no, it's not idempotent. it fails if the tarball was already
45 # extracted
46 # subprocess.check_output(shlex.split('hooks/install'))
4547
4648
47def copy_config():49def copy_config():

Subscribers

People subscribed via source and target branches