Merge lp:~brad-marshall/charm-helpers/remove-neutron-gateway-checks into lp:charm-helpers

[Brad Marshall]

Skip the nrpe checks for a couple of specific init scripts from neutron-gateway

Skip the nrpe checks for a couple of specific init scripts from neutron-gateway

[Stuart Bishop (stub)]

lgtm

review: Approve

=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
--- charmhelpers/contrib/charmsupport/nrpe.py	2015-10-30 06:43:01 +0000
+++ charmhelpers/contrib/charmsupport/nrpe.py	2015-11-19 01:00:25 +0000
@@ -337,11 +337,13 @@
         upstart_init = '/etc/init/%s.conf' % svc
         sysv_init = '/etc/init.d/%s' % svc
         if os.path.exists(upstart_init):
-            nrpe.add_check(
-                shortname=svc,
-                description='process check {%s}' % unit_name,
-                check_cmd='check_upstart_job %s' % svc
-            )
+            # Don't add a check for these services from neutron-gateway
+            if svc not in ['ext-port', 'os-charm-phy-nic-mtu']:
+                nrpe.add_check(
+                    shortname=svc,
+                    description='process check {%s}' % unit_name,
+                    check_cmd='check_upstart_job %s' % svc
+                )
         elif os.path.exists(sysv_init):
             cronpath = '/etc/cron.d/nagios-service-check-%s' % svc
             cron_file = ('*/5 * * * * root '