openstack/charm-keystone
Code Issues Proposed changes

Sync c-h nrpe.py file to fix nrpe files copy issue

Browse Source 
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:
Alex Kavanagh 2018-11-23 15:42:10 +00:00
parent 2851aefeb5
commit b77bc9cd1e
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
charmhelpers/contrib/charmsupport/nrpe.py
View File

@ -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:
os.getenv('CHARM_DIR'), # determine if "charmhelpers" is in CHARMDIR or CHARMDIR/hooks
'hooks', for segment in ['.', 'hooks']:
'charmhelpers', nrpe_files_dir = os.path.abspath(os.path.join(
'contrib', os.getenv('CHARM_DIR'),
'openstack', segment,
'files') 'charmhelpers',
if not nrpe_files_dir: 'contrib',
nrpe_files_dir = default_nrpe_files_dir 'openstack',
'files'))
if os.path.isdir(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_*")):