From 117f2bd2905f78b0dd534a0aee42aa7b6c67c16e Mon Sep 17 00:00:00 2001 From: Tytus Kurek Date: Tue, 20 Nov 2018 09:21:24 +0100 Subject: [PATCH] Sync charm-helpers Change-Id: I2c0a2003528eb025fec7c62b0de9b9f8fcb42923 --- charmhelpers/contrib/database/mysql.py | 8 +++++--- charmhelpers/contrib/openstack/utils.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/charmhelpers/contrib/database/mysql.py b/charmhelpers/contrib/database/mysql.py index e5494c1..21e8bfa 100644 --- a/charmhelpers/contrib/database/mysql.py +++ b/charmhelpers/contrib/database/mysql.py @@ -78,9 +78,11 @@ class MySQLHelper(object): self.delete_ondisk_passwd_file = delete_ondisk_passwd_file self.connection = None - def connect(self, user='root', password=None): - log("Opening db connection for %s@%s" % (user, self.host), level=DEBUG) - self.connection = MySQLdb.connect(user=user, host=self.host, + def connect(self, user='root', password=None, host=None): + if host is None: + host = self.host + log("Opening db connection for %s@%s" % (user, host), level=DEBUG) + self.connection = MySQLdb.connect(user=user, host=host, passwd=password) def database_exists(self, db_name): diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py index 29cad08..385b9ef 100644 --- a/charmhelpers/contrib/openstack/utils.py +++ b/charmhelpers/contrib/openstack/utils.py @@ -299,7 +299,7 @@ def get_os_codename_install_source(src): rel = '' if src is None: return rel - if src in ['distro', 'distro-proposed']: + if src in ['distro', 'distro-proposed', 'proposed']: try: rel = UBUNTU_OPENSTACK_RELEASE[ubuntu_rel] except KeyError: