Cleanup db imports (use heat code, don't import nova modules)

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py
index 9b2fff743ce2bb6cb2119a7a7e9105ef7c30ebe1..641bc7b899c3a4d14ad5fdd3dcad3a40d2d9b3cf 100644 (file)
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -16,7 +16,6 @@
 '''Implementation of SQLAlchemy backend.'''
 from sqlalchemy.orm.session import Session
 
-from nova import utils
 from heat.db.sqlalchemy import models
 from heat.db.sqlalchemy.session import get_session
 

diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index 51140b544e6b56d265cdacb3c0da388c2d016722..ea8d80a48ae1cd1cf7e9872fde8cc88351c4b2d1 100644 (file)
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -22,7 +22,7 @@ from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.schema import ForeignKeyConstraint
 from sqlalchemy import types as types
 from json import dumps, loads
-from nova import utils
+from heat.openstack.common import utils
 from heat.db.sqlalchemy.session import get_session
 
 BASE = declarative_base()