Revert "Fix haproxy nrpe checks"
Reverting this for a more general fix; see the topic bug/1796830.
This reverts commit 65c90e7c27
.
Change-Id: If7f7801b3b170f252c318de746c3d4d90edb808a
This commit is contained in:
parent
65c90e7c27
commit
a11fe58845
|
@ -730,13 +730,7 @@ def update_nrpe_config():
|
||||||
hostname = nrpe.get_nagios_hostname()
|
hostname = nrpe.get_nagios_hostname()
|
||||||
current_unit = nrpe.get_nagios_unit_name()
|
current_unit = nrpe.get_nagios_unit_name()
|
||||||
nrpe_setup = nrpe.NRPE(hostname=hostname)
|
nrpe_setup = nrpe.NRPE(hostname=hostname)
|
||||||
nrpe_files_dir = os.path.join(
|
nrpe.copy_nrpe_checks()
|
||||||
os.getenv('CHARM_DIR'),
|
|
||||||
'charmhelpers',
|
|
||||||
'contrib',
|
|
||||||
'openstack',
|
|
||||||
'files')
|
|
||||||
nrpe.copy_nrpe_checks(nrpe_files_dir)
|
|
||||||
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)
|
||||||
api_port = determine_api_port(config('bind-port'),
|
api_port = determine_api_port(config('bind-port'),
|
||||||
|
|
Loading…
Reference in New Issue