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

[Junien F]

[Tim Van Steenburgh (tvansteenburgh)]

LGTM

review: Approve

[Tom Haddon (mthaddon)]

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

Unmerged revisions

79. By Junien F 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

=== modified file 'hooks/memcached_hooks.py'
--- hooks/memcached_hooks.py	2017-05-05 10:30:16 +0000
+++ hooks/memcached_hooks.py	2018-01-26 11:28:02 +0000
@@ -299,17 +299,6 @@
 @restart_on_change(RESTART_MAP)
 def nrpe_external_master_relation_changed():
 
-    # make sure it's installed
-    apt_update(fatal=True)
-    apt_install(['nagios-nrpe-server'], fatal=True)
-    ufw.service('5666', 'open')
-    open_port('5666')
-
-    if ('nrpe-external-master' in hook_name()):
-        # make sure rsync port is open for check collection by external master
-        ufw.service('873/tcp', 'open')
-        open_port('873')
-
     if not os.path.isdir(LOCAL_NAGIOS_PLUGINS):
         os.makedirs(LOCAL_NAGIOS_PLUGINS)