openstack/neutron-vpnaas
Code Issues Proposed changes

Switch to using of oslo.db

Browse Source 
oslo.db first stable release has been cut and we can start using it
instead of openstack/common/db/* code which is now marked obsolete.

Change-Id: I1ccf896922a5a762d37a1a3b93c56c8b8ae8c085
This commit is contained in:
Roman Podoliaka 2014-06-30 11:20:35 +03:00
parent 7cdeebf7fc
commit 60f4633e1d
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/services/vpn/service_drivers/cisco_csr_db.py
View File

@ -14,6 +14,7 @@
# #
# @author: Paul Michali, Cisco Systems, Inc. # @author: Paul Michali, Cisco Systems, Inc.
from oslo.db import exception as db_exc
import sqlalchemy as sa import sqlalchemy as sa
from sqlalchemy.orm import exc as sql_exc 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 model_base
from neutron.db import models_v2 from neutron.db import models_v2
from neutron.db.vpn import vpn_db 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 from neutron.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

2
openstack-common.conf
View File

@ -2,8 +2,6 @@
# The list of modules to copy from oslo-incubator.git # The list of modules to copy from oslo-incubator.git
module=cache module=cache
module=context module=context
module=db
module=db.sqlalchemy
module=eventlet_backdoor module=eventlet_backdoor
module=excutils module=excutils
module=fileutils module=fileutils

1
requirements.txt
View File

@ -23,6 +23,7 @@ alembic>=0.4.1
six>=1.7.0 six>=1.7.0
stevedore>=0.14 stevedore>=0.14
oslo.config>=1.2.1 oslo.config>=1.2.1
oslo.db>=0.2.0
oslo.messaging>=1.3.0 oslo.messaging>=1.3.0
oslo.rootwrap oslo.rootwrap