Sync c-h nrpe.py file to fix nrpe files copy issue
Due to a change to PY3, the charmhelpers directory is not in the CHARMDIR rather than in CHARMDIR/hooks. This broke the copy_nrpe_checks() function in c-h. c-h has been updated, to look in both CHARMDIR and CHARMDIR/hooks for the charmhelpers directory, and this patchset includes the new function definition. Change-Id: Ifc0baabee4e06b79015e02b95634bce879ae84af Closes-Bug: #1796830
This commit is contained in:
parent
2851aefeb5
commit
b77bc9cd1e
@ -416,15 +416,20 @@ def copy_nrpe_checks(nrpe_files_dir=None):
|
|||||||
|
|
||||||
"""
|
"""
|
||||||
NAGIOS_PLUGINS = '/usr/local/lib/nagios/plugins'
|
NAGIOS_PLUGINS = '/usr/local/lib/nagios/plugins'
|
||||||
default_nrpe_files_dir = os.path.join(
|
if nrpe_files_dir is None:
|
||||||
|
# determine if "charmhelpers" is in CHARMDIR or CHARMDIR/hooks
|
||||||
|
for segment in ['.', 'hooks']:
|
||||||
|
nrpe_files_dir = os.path.abspath(os.path.join(
|
||||||
os.getenv('CHARM_DIR'),
|
os.getenv('CHARM_DIR'),
|
||||||
'hooks',
|
segment,
|
||||||
'charmhelpers',
|
'charmhelpers',
|
||||||
'contrib',
|
'contrib',
|
||||||
'openstack',
|
'openstack',
|
||||||
'files')
|
'files'))
|
||||||
if not nrpe_files_dir:
|
if os.path.isdir(nrpe_files_dir):
|
||||||
nrpe_files_dir = default_nrpe_files_dir
|
break
|
||||||
|
else:
|
||||||
|
raise RuntimeError("Couldn't find charmhelpers directory")
|
||||||
if not os.path.exists(NAGIOS_PLUGINS):
|
if not os.path.exists(NAGIOS_PLUGINS):
|
||||||
os.makedirs(NAGIOS_PLUGINS)
|
os.makedirs(NAGIOS_PLUGINS)
|
||||||
for fname in glob.glob(os.path.join(nrpe_files_dir, "check_*")):
|
for fname in glob.glob(os.path.join(nrpe_files_dir, "check_*")):
|
||||||
|
Loading…
Reference in New Issue
Block a user