diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-02-15 22:30:16 +0000 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2013-02-19 21:16:32 -0800 |
| commit | 706a1370056ffccc2c8811fc1ac0679944564ece (patch) | |
| tree | 0b71139bbf282e7909b0df37a69a2aaa8f3e32d2 /nova/db/sqlalchemy/models.py | |
| parent | d62205f316ad9490e1379e943972a007e071c688 (diff) | |
| download | nova-706a1370056ffccc2c8811fc1ac0679944564ece.tar.gz nova-706a1370056ffccc2c8811fc1ac0679944564ece.tar.xz nova-706a1370056ffccc2c8811fc1ac0679944564ece.zip | |
Use oslo-config-2013.1b4
The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.
Add the 2013.1b4 tarball to tools/pip-requires - this will be changed
to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
will happen in time for grizzly final.
Add dependency_links to setup.py so that oslo-config can be installed
from the tarball URL specified in pip-requires.
Remove the 'deps = pep8==1.3.3' from tox.ini as it means all the other
deps get installed with easy_install which can't install oslo-config
from the URL.
Make tools/hacking.py include oslo in IMPORT_EXCEPTIONS like it already
does for paste. It turns out imp.find_module() doesn't correct handle
namespace packages.
Retain dummy cfg.py file until keystoneclient middleware has been
updated (I18c450174277c8e2d15ed93879da6cd92074c27a).
Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
Diffstat (limited to 'nova/db/sqlalchemy/models.py')
| -rw-r--r-- | nova/db/sqlalchemy/models.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index f0dcd3307..95456bf98 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -25,13 +25,12 @@ from sqlalchemy import Column, Integer, BigInteger, String, schema from sqlalchemy.ext.declarative import declarative_base from sqlalchemy import ForeignKey, DateTime, Boolean, Text, Float from sqlalchemy.orm import relationship, backref, object_mapper +from oslo.config import cfg from nova.db.sqlalchemy import types -from nova.openstack.common import cfg from nova.openstack.common.db.sqlalchemy import models from nova.openstack.common import timeutils - CONF = cfg.CONF BASE = declarative_base() |