Merge lp:~paulgear/charms/trusty/memcached/detect-nagios-context-changed into lp:charms/trusty/memcached

[Paul Gear]

[Paul Gear (paulgear)]

This MP seems to cause the test suite some difficulty. This appears to be because it uses features of config() from charmhelpers.core.hookenv that are not accurately emulated by the mocked up version in the test suite.

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-11065-results

review: Needs Fixing (automated testing)

[Adam Israel (aisrael)]

Hi Paul,

Thanks again for your work on improving the memcached charm. I'm going to have to NACK this merge proposal. The failing tests are due to un-mocked methods. Additionally, there's an undefined variable, local_unit_name, that will fail once the mocking is in place.

[Adam Israel (aisrael)]

review: Needs Fixing

Unmerged revisions

67. By Paul Gear on 2015-02-24

Detect changed nagios_context setting; remove obsolete Nagios check if this occurs

=== modified file 'hooks/memcached_hooks.py'
--- hooks/memcached_hooks.py	2015-02-20 16:15:18 +0000
+++ hooks/memcached_hooks.py	2015-02-24 07:03:16 +0000
@@ -246,6 +246,9 @@
     # In case port changed, inform consumers
     cache_relation_joined()
 
+    # nagios_context might have changed
+    check_nagios_config_change()
+
 
 @hooks.hook('munin-relation-changed')
 @restart_on_change(RESTART_MAP)
@@ -288,6 +291,17 @@
         os.chmod(os.path.join(LOCAL_NAGIOS_PLUGINS, "check_memcache.py"),
                  0o555)
 
+    check_nagios_config_change()
+
+
+def check_nagios_config_change():
+    cfg = config()
+    if cfg.changed('nagios_context'):
+        old_hostname = "{}-{}".format(cfg.previous('nagios_context'),
+                                      local_unit_name)
+        os.remove(('/var/lib/nagios/export/service__{}_check_'
+                   'memcached.cfg').format(old_hostname))
+
     nagios_hostname = "{}-{}".format(config('nagios_context'),
                                      local_unit().replace('/', '-'))
     configs = {'tcp_port': config('tcp_port'),