Merge lp:~axino/charms/trusty/memcached/trunk into lp:charms/trusty/memcached

Proposed by Junien Fridrick on 2018-01-26
Status: Needs review
Proposed branch: lp:~axino/charms/trusty/memcached/trunk
Merge into: lp:charms/trusty/memcached
Diff against target: 20 lines (+0/-11)
1 file modified
hooks/memcached_hooks.py (+0/-11)
To merge this branch: bzr merge lp:~axino/charms/trusty/memcached/trunk
Reviewer Review Type Date Requested Status
Tim Van Steenburgh (community) 2018-01-26 Approve on 2018-03-20
Review via email: mp+336664@code.launchpad.net
To post a comment you must log in.
Tim Van Steenburgh (tvansteenburgh) wrote :

LGTM

review: Approve
Tom Haddon (mthaddon) wrote :

I've merged this into the new lp:memcached-charm repo.

Unmerged revisions

79. By Junien Fridrick on 2018-01-26

don't touch the nrpe and rsync ports, this is the job of the nrpe charm

This is fatal with juju2

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/memcached_hooks.py'
2--- hooks/memcached_hooks.py 2017-05-05 10:30:16 +0000
3+++ hooks/memcached_hooks.py 2018-01-26 11:28:02 +0000
4@@ -299,17 +299,6 @@
5 @restart_on_change(RESTART_MAP)
6 def nrpe_external_master_relation_changed():
7
8- # make sure it's installed
9- apt_update(fatal=True)
10- apt_install(['nagios-nrpe-server'], fatal=True)
11- ufw.service('5666', 'open')
12- open_port('5666')
13-
14- if ('nrpe-external-master' in hook_name()):
15- # make sure rsync port is open for check collection by external master
16- ufw.service('873/tcp', 'open')
17- open_port('873')
18-
19 if not os.path.isdir(LOCAL_NAGIOS_PLUGINS):
20 os.makedirs(LOCAL_NAGIOS_PLUGINS)
21

Subscribers

People subscribed via source and target branches