Remove deprecated glance-registry from nrpe checks
This patch removes the deprecated glance-registry service from nrpe checks after an openstack upgrade to an openstack version greater than Rocky Closes-Bug: #1849896 Depends-On: https://github.com/juju/charm-helpers/pull/409 Change-Id: I274441966f15f66341adf30c07c625cc76b2ecb6 Signed-off-by: Alexandros Soumplis <soumplis@admin.grnet.gr>
This commit is contained in:
parent
16acb63fcc
commit
b5e6a3e03a
|
@ -484,3 +484,13 @@ def add_haproxy_checks(nrpe, unit_name):
|
||||||
shortname='haproxy_queue',
|
shortname='haproxy_queue',
|
||||||
description='Check HAProxy queue depth {%s}' % unit_name,
|
description='Check HAProxy queue depth {%s}' % unit_name,
|
||||||
check_cmd='check_haproxy_queue_depth.sh')
|
check_cmd='check_haproxy_queue_depth.sh')
|
||||||
|
|
||||||
|
def remove_deprecated_check(nrpe, deprecated_services):
|
||||||
|
"""
|
||||||
|
Remove checks fro deprecated services in list
|
||||||
|
|
||||||
|
:param NRPE nrpe: NRPE object to remove check from
|
||||||
|
"""
|
||||||
|
for dep_svc in deprecated_services:
|
||||||
|
log('Deprecated service: {}'.format(dep_svc))
|
||||||
|
nrpe.remove_check(shortname=dep_svc)
|
|
@ -56,6 +56,7 @@ from glance_utils import (
|
||||||
pause_unit_helper,
|
pause_unit_helper,
|
||||||
resume_unit_helper,
|
resume_unit_helper,
|
||||||
remove_old_packages,
|
remove_old_packages,
|
||||||
|
deprecated_services,
|
||||||
)
|
)
|
||||||
from charmhelpers.core.hookenv import (
|
from charmhelpers.core.hookenv import (
|
||||||
charm_dir,
|
charm_dir,
|
||||||
|
@ -526,6 +527,7 @@ def update_nrpe_config():
|
||||||
nrpe_files_dir = os.path.join(
|
nrpe_files_dir = os.path.join(
|
||||||
charm_dir(), 'charmhelpers', 'contrib', 'openstack', 'files')
|
charm_dir(), 'charmhelpers', 'contrib', 'openstack', 'files')
|
||||||
nrpe.copy_nrpe_checks(nrpe_files_dir=nrpe_files_dir)
|
nrpe.copy_nrpe_checks(nrpe_files_dir=nrpe_files_dir)
|
||||||
|
nrpe.remove_deprecated_check(nrpe_setup, deprecated_services())
|
||||||
nrpe.add_init_service_checks(nrpe_setup, services(), current_unit)
|
nrpe.add_init_service_checks(nrpe_setup, services(), current_unit)
|
||||||
nrpe.add_haproxy_checks(nrpe_setup, current_unit)
|
nrpe.add_haproxy_checks(nrpe_setup, current_unit)
|
||||||
nrpe_setup.write()
|
nrpe_setup.write()
|
||||||
|
|
|
@ -389,6 +389,15 @@ def services():
|
||||||
return list(set(chain(*restart_map().values())))
|
return list(set(chain(*restart_map().values())))
|
||||||
|
|
||||||
|
|
||||||
|
def deprecated_services():
|
||||||
|
''' Returns a list of deprecated services with this charm '''
|
||||||
|
cmp_release = CompareOpenStackReleases(os_release('glance-common'))
|
||||||
|
if cmp_release >= 'stein':
|
||||||
|
return ['glance-registry']
|
||||||
|
|
||||||
|
return []
|
||||||
|
|
||||||
|
|
||||||
def setup_ipv6():
|
def setup_ipv6():
|
||||||
ubuntu_rel = lsb_release()['DISTRIB_CODENAME'].lower()
|
ubuntu_rel = lsb_release()['DISTRIB_CODENAME'].lower()
|
||||||
if CompareHostReleases(ubuntu_rel) < "trusty":
|
if CompareHostReleases(ubuntu_rel) < "trusty":
|
||||||
|
|
Loading…
Reference in New Issue