summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorey Bryant <corey.bryant@canonical.com>2019-01-11 14:35:07 +0000
committerCorey Bryant <corey.bryant@canonical.com>2019-01-11 14:35:13 +0000
commit2c7836899d16c4ee832f2fef9f84f31c10a756f5 (patch)
treeef7d5d23d01e9afc850d11678ab0be117d1fb416
parent609631e658578b4d0ee4b3ce2e1fac8fcd120aaf (diff)
Sync charm-helpers
Notes
Notes (review): Verified+1: Canonical CI <uosci-testing-bot@ubuntu.com> Code-Review+2: Frode Nordahl <frode.nordahl@canonical.com> Workflow+1: Frode Nordahl <frode.nordahl@canonical.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 14 Jan 2019 13:38:30 +0000 Reviewed-on: https://review.openstack.org/630253 Project: openstack/charm-ceph-proxy Branch: refs/heads/master
-rw-r--r--hooks/charmhelpers/contrib/charmsupport/nrpe.py2
-rw-r--r--hooks/charmhelpers/fetch/archiveurl.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/hooks/charmhelpers/contrib/charmsupport/nrpe.py b/hooks/charmhelpers/contrib/charmsupport/nrpe.py
index f59fdd6..0626b32 100644
--- a/hooks/charmhelpers/contrib/charmsupport/nrpe.py
+++ b/hooks/charmhelpers/contrib/charmsupport/nrpe.py
@@ -126,7 +126,7 @@ class CheckException(Exception):
126 126
127 127
128class Check(object): 128class Check(object):
129 shortname_re = '[A-Za-z0-9-_.]+$' 129 shortname_re = '[A-Za-z0-9-_.@]+$'
130 service_template = (""" 130 service_template = ("""
131#--------------------------------------------------- 131#---------------------------------------------------
132# This file is Juju managed 132# This file is Juju managed
diff --git a/hooks/charmhelpers/fetch/archiveurl.py b/hooks/charmhelpers/fetch/archiveurl.py
index dd24f9e..d25587a 100644
--- a/hooks/charmhelpers/fetch/archiveurl.py
+++ b/hooks/charmhelpers/fetch/archiveurl.py
@@ -89,7 +89,7 @@ class ArchiveUrlFetchHandler(BaseFetchHandler):
89 :param str source: URL pointing to an archive file. 89 :param str source: URL pointing to an archive file.
90 :param str dest: Local path location to download archive file to. 90 :param str dest: Local path location to download archive file to.
91 """ 91 """
92 # propogate all exceptions 92 # propagate all exceptions
93 # URLError, OSError, etc 93 # URLError, OSError, etc
94 proto, netloc, path, params, query, fragment = urlparse(source) 94 proto, netloc, path, params, query, fragment = urlparse(source)
95 if proto in ('http', 'https'): 95 if proto in ('http', 'https'):