Sync charm-helpers
Change-Id: I2c0a2003528eb025fec7c62b0de9b9f8fcb42923
This commit is contained in:
parent
9b5822471a
commit
117f2bd290
|
@ -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):
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue