summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Bryant <corey.bryant@canonical.com>2019-01-11 14:37:49 +0000
committerCorey Bryant <corey.bryant@canonical.com>2019-01-11 14:37:54 +0000
commit0cc0325d85a1f83de7c419c2681bbd1d81283f07 (patch)
tree791af4b82213813186979c6901e188a67556bfda
parent8f62a485014d8aba57b2e9c0ec4a3f8a6c547be2 (diff)
downloadcharm-nova-lxd-0cc0325d85a1f83de7c419c2681bbd1d81283f07.zip
charm-nova-lxd-0cc0325d85a1f83de7c419c2681bbd1d81283f07.tar.gz
charm-nova-lxd-0cc0325d85a1f83de7c419c2681bbd1d81283f07.tar.bz2
Sync charm-helpers
Change-Id: Ie4af48e8a8c44e5a5c3f90ce7ee0529ada0351c3
-rw-r--r--hooks/charmhelpers/contrib/charmsupport/nrpe.py2
-rw-r--r--hooks/charmhelpers/contrib/openstack/context.py5
2 files changed, 6 insertions, 1 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):
class Check(object):
- shortname_re = '[A-Za-z0-9-_.]+$'
+ shortname_re = '[A-Za-z0-9-_.@]+$'
service_template = ("""
#---------------------------------------------------
# This file is Juju managed
diff --git a/hooks/charmhelpers/contrib/openstack/context.py b/hooks/charmhelpers/contrib/openstack/context.py
index d892bad..8a20375 100644
--- a/hooks/charmhelpers/contrib/openstack/context.py
+++ b/hooks/charmhelpers/contrib/openstack/context.py
@@ -97,6 +97,7 @@ from charmhelpers.contrib.network.ip import (
)
from charmhelpers.contrib.openstack.utils import (
config_flags_parser,
+ get_os_codename_install_source,
enable_memcache,
CompareOpenStackReleases,
os_release,
@@ -240,6 +241,8 @@ class SharedDBContext(OSContextGenerator):
else:
rids = relation_ids(self.interfaces[0])
+ rel = (get_os_codename_install_source(config('openstack-origin')) or
+ 'icehouse')
for rid in rids:
self.related = True
for unit in related_units(rid):
@@ -253,6 +256,8 @@ class SharedDBContext(OSContextGenerator):
'database_password': rdata.get(password_setting),
'database_type': 'mysql+pymysql'
}
+ if CompareOpenStackReleases(rel) < 'stein':
+ ctxt['database_type'] = 'mysql'
if self.context_complete(ctxt):
db_ssl(rdata, ctxt, self.ssl_dir)
return ctxt

This mirror site include all the OpenStack related repositories under: openstack, openstack-dev and openstack-infra.

NOTE: All repositories are updated every one hour.

Usage

For Git Clone
 git clone http://git.trystack.cn/openstack/nova.git 
For DevStack

Add GIT_BASE, NOVNC_REPO and SPICE_REPO variables to local.conf file.

[[local|localrc]]

# use TryStack git mirror
GIT_BASE=http://git.trystack.cn
NOVNC_REPO=http://git.trystack.cn/kanaka/noVNC.git
SPICE_REPO=http://git.trystack.cn/git/spice/spice-html5.git