diff --git a/neutron/services/vpn/service_drivers/cisco_csr_db.py b/neutron/services/vpn/service_drivers/cisco_csr_db.py index e1f0760cd..e98fb8208 100644 --- a/neutron/services/vpn/service_drivers/cisco_csr_db.py +++ b/neutron/services/vpn/service_drivers/cisco_csr_db.py @@ -14,6 +14,7 @@ # # @author: Paul Michali, Cisco Systems, Inc. +from oslo.db import exception as db_exc import sqlalchemy as sa from sqlalchemy.orm import exc as sql_exc @@ -21,7 +22,6 @@ from neutron.common import exceptions from neutron.db import model_base from neutron.db import models_v2 from neutron.db.vpn import vpn_db -from neutron.openstack.common.db import exception as db_exc from neutron.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/openstack-common.conf b/openstack-common.conf index d15422adc..6e6c64e9e 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -2,8 +2,6 @@ # The list of modules to copy from oslo-incubator.git module=cache module=context -module=db -module=db.sqlalchemy module=eventlet_backdoor module=excutils module=fileutils diff --git a/requirements.txt b/requirements.txt index 24f7c2c9b..a665bb3f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,6 +23,7 @@ alembic>=0.4.1 six>=1.7.0 stevedore>=0.14 oslo.config>=1.2.1 +oslo.db>=0.2.0 oslo.messaging>=1.3.0 oslo.rootwrap