Move oslo.db references to oslo_db

The oslo team is recommending changing to non-namespaced references.

Implements: blueprint drop-namespace-packages
Change-Id: Iefe0a771dc8328bc92e13dd6d66fdd3853d5bba6

5 files changed, 8 insertions, 8 deletions

diff --git a/ironic/db/api.py b/ironic/db/api.py
index e535b262f..c139b0335 100644
--- a/ironic/db/api.py
+++ b/ironic/db/api.py
@@ -20,7 +20,7 @@ Base classes for storage engines
 import abc
 
 from oslo.config import cfg
-from oslo.db import api as db_api
+from oslo_db import api as db_api
 import six
 
 
diff --git a/ironic/db/migration.py b/ironic/db/migration.py
index cef46860b..6dc59906b 100644
--- a/ironic/db/migration.py
+++ b/ironic/db/migration.py
@@ -25,7 +25,7 @@ _IMPL = None
 def get_backend():
     global _IMPL
     if not _IMPL:
-        cfg.CONF.import_opt('backend', 'oslo.db.options', group='database')
+        cfg.CONF.import_opt('backend', 'oslo_db.options', group='database')
         _IMPL = driver.DriverManager("ironic.database.migration_backend",
                                      cfg.CONF.database.backend).driver
     return _IMPL
diff --git a/ironic/db/sqlalchemy/api.py b/ironic/db/sqlalchemy/api.py
index 4b624f527..a919c59b6 100644
--- a/ironic/db/sqlalchemy/api.py
+++ b/ironic/db/sqlalchemy/api.py
@@ -20,10 +20,10 @@ import collections
 import datetime
 
 from oslo.config import cfg
-from oslo.db import exception as db_exc
-from oslo.db.sqlalchemy import session as db_session
-from oslo.db.sqlalchemy import utils as db_utils
 from oslo.utils import timeutils
+from oslo_db import exception as db_exc
+from oslo_db.sqlalchemy import session as db_session
+from oslo_db.sqlalchemy import utils as db_utils
 from sqlalchemy.orm.exc import NoResultFound
 
 from ironic.common import exception
diff --git a/ironic/db/sqlalchemy/migration.py b/ironic/db/sqlalchemy/migration.py
index d2286d6d6..cfd70f494 100644
--- a/ironic/db/sqlalchemy/migration.py
+++ b/ironic/db/sqlalchemy/migration.py
@@ -19,7 +19,7 @@ import os
 import alembic
 from alembic import config as alembic_config
 import alembic.migration as alembic_migration
-from oslo.db import exception as db_exc
+from oslo_db import exception as db_exc
 
 from ironic.db.sqlalchemy import api as sqla_api
 from ironic.db.sqlalchemy import models
diff --git a/ironic/db/sqlalchemy/models.py b/ironic/db/sqlalchemy/models.py
index 5f4579d10..186e416fd 100644
--- a/ironic/db/sqlalchemy/models.py
+++ b/ironic/db/sqlalchemy/models.py
@@ -21,8 +21,8 @@ SQLAlchemy models for baremetal data.
 import json
 
 from oslo.config import cfg
-from oslo.db import options as db_options
-from oslo.db.sqlalchemy import models
+from oslo_db import options as db_options
+from oslo_db.sqlalchemy import models
 import six.moves.urllib.parse as urlparse
 from sqlalchemy import Boolean, Column, DateTime
 from sqlalchemy import ForeignKey, Integer