Remove deprecated neutron-lbaasv2-agent from NRPE checks

This patch removes the deprecated neutron-lbaasv2-agent service from
NRPE checks after an OpenStack upgrade to an OpenStack version greater
than Stein.

Depends-On: https://github.com/juju/charm-helpers/pull/409

Change-Id: I5f943941328f8a9cd0701e626e4557e243bf37f0
Signed-off-by: Aggelos Kolaitis <akolaitis@admin.grnet.gr>
(cherry picked from commit 7e68feed95)

hooks/charmhelpers/contrib/charmsupport/nrpe.py

@@ -484,3 +484,17 @@ def add_haproxy_checks(nrpe, unit_name):
         shortname='haproxy_queue',
         description='Check HAProxy queue depth {%s}' % unit_name,
         check_cmd='check_haproxy_queue_depth.sh')
+
+
+def remove_deprecated_check(nrpe, deprecated_services):
+    """
+    Remove checks fro deprecated services in list
+
+    :param nrpe: NRPE object to remove check from
+    :type nrpe: NRPE
+    :param deprecated_services: List of deprecated services that are removed
+    :type deprecated_services: list
+    """
+    for dep_svc in deprecated_services:
+        log('Deprecated service: {}'.format(dep_svc))
+        nrpe.remove_check(shortname=dep_svc)

hooks/neutron_hooks.py

@@ -72,6 +72,7 @@ from neutron_utils import (
     remove_legacy_nova_metadata,
     disable_nova_metadata,
     remove_old_packages,
+    deprecated_services,
 )
 
 hooks = Hooks()
@@ -300,6 +301,7 @@ def update_nrpe_config():
     hostname = nrpe.get_nagios_hostname()
     current_unit = nrpe.get_nagios_unit_name()
     nrpe_setup = nrpe.NRPE(hostname=hostname)
+    nrpe.remove_deprecated_check(nrpe_setup, deprecated_services())
     nrpe.add_init_service_checks(nrpe_setup, services(), current_unit)
 
     cronpath = '/etc/cron.d/nagios-netns-check'

hooks/neutron_utils.py

@@ -1118,3 +1118,12 @@ def configure_apparmor():
         profiles.remove(NEUTRON_LBAASV2_AA_PROFILE)
     for profile in profiles:
         context.AppArmorContext(profile).setup_aa_profile()
+
+
+def deprecated_services():
+    ''' Returns a list of deprecated services with this charm '''
+    cmp_release = CompareOpenStackReleases(os_release('neutron-common'))
+    if cmp_release >= 'train':
+        return ['neutron-lbaasv2-agent']
+
+    return []