From 261bd079c75909724bb3d84acda912a0bb56fe38 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 7 Dec 2012 17:28:46 +0000 Subject: [PATCH] Added upstream patch to read sql_connection from /etc/heat/heat-engine.conf Rewritten-From: 40948ab8315d5b95bb24798ad56c456a65eb10ac --- ...onfig-file-for-DB-connection-details.patch | 41 +++++++++++++++++++ xenial/debian/patches/series | 1 + 2 files changed, 42 insertions(+) create mode 100644 xenial/debian/patches/heat-db-setup-read-engine-config-file-for-DB-connection-details.patch create mode 100644 xenial/debian/patches/series diff --git a/xenial/debian/patches/heat-db-setup-read-engine-config-file-for-DB-connection-details.patch b/xenial/debian/patches/heat-db-setup-read-engine-config-file-for-DB-connection-details.patch new file mode 100644 index 00000000..2c4a9d13 --- /dev/null +++ b/xenial/debian/patches/heat-db-setup-read-engine-config-file-for-DB-connection-details.patch @@ -0,0 +1,41 @@ +Description: heat-db-setup read engine config file for DB connection details + Currently heat-db-setup, or rather the underlying python -m heat.db.sqlalchemy.manage + has a hard-coded database connection URL, so DB setup will fail if a non-default + configuration exists in /etc/heat/heat-engine.conf. + . + This attempts to read the sql_connection from the DEFAULT section of heat-engine.conf + falling back to the old default string on failure. +bug/1087741 +Author: Steven Hardy +Origin: upstream, https://review.openstack.org/gitweb?p=openstack%2Fheat.git;a=commitdiff;h=14d8a7a19f89bbafe9a5017dbb581051708ce58a +Bug-Ubuntu: https://launchpad.net/bugs/1087741 + +--- heat-0.0.7.orig/heat/db/sqlalchemy/manage.py ++++ heat-0.0.7/heat/db/sqlalchemy/manage.py +@@ -1,14 +1,24 @@ + #!/usr/bin/env python + from migrate.versioning.shell import main + import migrate.exceptions ++import ConfigParser + + if __name__ == '__main__': + import os.path + migrate_repo_path = os.path.join(os.path.dirname(__file__), + 'migrate_repo') + ++ # Try to get the config-file value for sql_connection ++ # Note we can't use openstack.common.cfg because this also insists ++ # on parsing the CLI, which we don't want here ++ config = ConfigParser.SafeConfigParser() + try: +- main(url='mysql://heat:heat@localhost/heat', debug='False', +- repository=migrate_repo_path) ++ config = ConfigParser.SafeConfigParser() ++ config.readfp(open('/etc/heat/heat-engine.conf')) ++ sql_connection = config.get('DEFAULT', 'sql_connection') ++ except Exception: ++ sql_connection = 'mysql://heat:heat@localhost/heat' ++ try: ++ main(url=sql_connection, debug='False', repository=migrate_repo_path) + except migrate.exceptions.DatabaseAlreadyControlledError: + print 'Database already version controlled.' diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series new file mode 100644 index 00000000..ca50a292 --- /dev/null +++ b/xenial/debian/patches/series @@ -0,0 +1 @@ +heat-db-setup-read-engine-config-file-for-DB-connection-details.patch -- 2.45.2