openstack/deb-aodh
Code Issues Proposed changes

Session does not use ceilometer.conf's database_connection

Browse Source 
use [database]connection setting from openstack.common sqlalchemy session

Change-Id: I582d4cb7d51d6ddecc27ae5fcdedcfd19dc898af
Fixes: bug #1183106
This commit is contained in:
Gordon Chung
2013-05-28 11:48:43 -04:00
parent 0e2274253e
commit 9f6e3639fb
11 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/storage/impl_sqlalchemy.py
View File

@@ -132,11 +132,11 @@ class Connection(base.Connection):
"""SqlAlchemy connection."""
def __init__(self, conf):
url = conf.database_connection
url = conf.database.connection
if url == 'sqlite://':
url = os.environ.get('CEILOMETER_TEST_SQL_URL', url)
LOG.info('connecting to %s', url)
self.session = sqlalchemy_session.get_session(url, conf)
self.session = sqlalchemy_session.get_session()
def upgrade(self, version=None):
migration.db_sync(self.session.get_bind(), version=version)