Sync charm-helpers and corresponding amulet update

Change-Id: I1fa94046cd49739dcb09ac3b2a06e8930d496e9a
This commit is contained in:
Corey Bryant 2019-01-11 14:37:15 +00:00
parent d965a3811b
commit 3e7baa7014
2 changed files with 10 additions and 1 deletions

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

View File

@ -547,7 +547,11 @@ class HeatBasicDeployment(OpenStackAmuletDeployment):
u.log.debug('rabbitmq:heat relation: {}'.format(rmq_rel))
u.log.debug('percona-cluster:heat relation: {}'.format(mysql_rel))
db_uri = "{}://{}:{}@{}/{}".format('mysql+pymysql',
if self._get_openstack_release() < self.bionic_stein:
dialect = 'mysql'
else:
dialect = 'mysql+pymysql'
db_uri = "{}://{}:{}@{}/{}".format(dialect,
'heat',
mysql_rel['heat_password'],
mysql_rel['db_host'],