Sync charm-helpers

Change-Id: Ibb59da4addda1ec9feb75c5839e695e49c23a543
This commit is contained in:
Corey Bryant 2019-01-11 14:39:34 +00:00
parent 7eace942f2
commit 903cbfdb2f
2 changed files with 6 additions and 1 deletions

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

View File

@ -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