Merge lp:~mthaddon/charms/trusty/logstash/execd into lp:~foli/charms/trusty/logstash/add-lumberjack-protocol

Proposed by Tom Haddon on 2015-04-16
Status: Merged
Merged at revision: 53
Proposed branch: lp:~mthaddon/charms/trusty/logstash/execd
Merge into: lp:~foli/charms/trusty/logstash/add-lumberjack-protocol
Diff against target: 21 lines (+3/-0)
1 file modified
hooks/install (+3/-0)
To merge this branch: bzr merge lp:~mthaddon/charms/trusty/logstash/execd
Reviewer Review Type Date Requested Status
Michael Foley 2015-04-16 Approve on 2015-04-17
Review via email: mp+256457@code.launchpad.net

Description of the change

Add support for exec.d infrastructure so we can customise instances

To post a comment you must log in.
Michael Foley (foli) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'exec.d'
2=== modified file 'hooks/install'
3--- hooks/install 2014-09-23 20:20:33 +0000
4+++ hooks/install 2015-04-16 10:13:25 +0000
5@@ -22,6 +22,8 @@
6 apt_install,
7 )
8
9+from charmhelpers.payload.execd import execd_preinstall
10+
11 hooks = Hooks()
12 log = log
13
14@@ -31,6 +33,7 @@
15
16 @hooks.hook('install')
17 def install():
18+ execd_preinstall()
19 log('Installing logstash')
20 packages = ['openjdk-7-jre-headless', 'redis-server', 'python-jinja2']
21 extra_packages = config('extra-packages')

Subscribers

People subscribed via source and target branches

to all changes: