Merge "Use oslo database code"

1 files changed, 2 insertions, 1 deletions

diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index c53f4bcdc..045a24d4d 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -27,6 +27,7 @@ from nova import context
 from nova import db
 from nova import exception
 from nova.openstack.common import cfg
+from nova.openstack.common.db.sqlalchemy import session as db_session
 from nova.openstack.common import log as logging
 from nova import utils
 
@@ -129,7 +130,7 @@ def create(name, memory, vcpus, root_gb, ephemeral_gb=None, flavorid=None,
 
     try:
         return db.instance_type_create(context.get_admin_context(), kwargs)
-    except exception.DBError, e:
+    except db_session.DBError, e:
         LOG.exception(_('DB error: %s') % e)
         raise exception.InstanceTypeCreateFailed()