openstack
/
charm-hacluster
Code Issues Proposed changes

Sync charm-helpers 

Change-Id: I3634727db57eba68e8c838499bb9405121fa5d57
This commit is contained in:
Corey Bryant 2019-01-11 14:37:03 +00:00
parent c6f299747b
commit 217e818042
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/charmhelpers/contrib/charmsupport/nrpe.py
View File

@ -126,7 +126,7 @@ class CheckException(Exception):
class Check(object):
shortname_re = '[A-Za-z0-9-_.]+$'
shortname_re = '[A-Za-z0-9-_.@]+$'
service_template = ("""
#---------------------------------------------------
# This file is Juju managed

2
hooks/charmhelpers/fetch/archiveurl.py
View File

@ -89,7 +89,7 @@ class ArchiveUrlFetchHandler(BaseFetchHandler):
:param str source: URL pointing to an archive file.
:param str dest: Local path location to download archive file to.
"""
# propogate all exceptions
# propagate all exceptions
# URLError, OSError, etc
proto, netloc, path, params, query, fragment = urlparse(source)
if proto in ('http', 'https'):