Drop use of 'oslo' namespace package

The Oslo libraries have moved all of their code out of the 'oslo'
namespace package into per-library packages. The namespace package was
retained during kilo for backwards compatibility, but will be removed by
the liberty-2 milestone. This change removes the use of the namespace
package, replacing it with the new package names.

The patches in the libraries will be put on hold until application
patches have landed, or L2, whichever comes first. At that point, new
versions of the libraries without namespace packages will be released as
a major version update.

Please merge this patch, or an equivalent, before L2 to avoid problems
with those library releases.

Blueprint: remove-namespace-packages
https://blueprints.launchpad.net/oslo-incubator/+spec/remove-namespace-packages

Change-Id: Id25875f3ef51c2b84cf2b9362039a5196feaa531

tuskar/api/__init__.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 API_SERVICE_OPTS = [
     cfg.StrOpt(

tuskar/api/acl.py

@@ -16,7 +16,7 @@
 """Access Control Lists (ACL's) control access the API server."""
 
 from keystoneclient.middleware import auth_token
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 OPT_GROUP_NAME = 'keystone_authtoken'

tuskar/api/app.py

@@ -14,7 +14,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 
 from tuskar.api import acl

tuskar/api/hooks.py

@@ -13,7 +13,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 from pecan import hooks
 
 from tuskar.db import api as dbapi

tuskar/cmd/api.py

@@ -21,7 +21,7 @@ import logging
 import sys
 from wsgiref import simple_server
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.api import app
 from tuskar.common import service as tuskar_service

tuskar/cmd/delete_roles.py

@@ -18,7 +18,7 @@ from __future__ import print_function
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import service
 from tuskar.storage.delete_roles import delete_roles

tuskar/cmd/load_role.py

@@ -19,7 +19,7 @@ from __future__ import print_function
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import service
 from tuskar.storage.load_roles import load_role

tuskar/cmd/load_roles.py

@@ -19,7 +19,7 @@ from __future__ import print_function
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import service
 from tuskar.storage.load_roles import load_roles

tuskar/cmd/load_seed.py

@@ -16,7 +16,7 @@ from __future__ import print_function
 
 import sys
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import service
 from tuskar.storage.load_roles import load_seed

tuskar/common/config.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from oslo.config import cfg
-from oslo.db import options as db_options
+from oslo_config import cfg
+from oslo_db import options as db_options
 
 from tuskar import version
 

tuskar/common/exception.py

@@ -18,7 +18,7 @@ Includes decorator for re-raising Tuskar-type exceptions.
 SHOULD include dedicated exception logging.
 """
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 
 from tuskar.openstack.common.gettextutils import _  # noqa

tuskar/common/paths.py

@@ -17,7 +17,7 @@
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 path_opts = [
     cfg.StrOpt('pybasedir',

tuskar/common/service.py

@@ -16,7 +16,7 @@
 
 import socket
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.openstack.common import log
 

tuskar/common/utils.py

@@ -21,7 +21,7 @@
 import os
 import re
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import exception
 from tuskar.openstack.common import log as logging

tuskar/db/api.py

@@ -18,8 +18,8 @@ Base classes for storage engines
 
 import abc
 
-from oslo.config import cfg
-from oslo.db import api as db_api
+from oslo_config import cfg
+from oslo_db import api as db_api
 import six
 
 _BACKEND_MAPPING = {'sqlalchemy': 'tuskar.db.sqlalchemy.api'}

tuskar/db/sqlalchemy/api.py

@@ -17,9 +17,9 @@
 
 import threading
 
-from oslo.config import cfg
-from oslo.db import exception as db_exception
-from oslo.db.sqlalchemy import session as db_session
+from oslo_config import cfg
+from oslo_db import exception as db_exception
+from oslo_db.sqlalchemy import session as db_session
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.orm import subqueryload

tuskar/db/sqlalchemy/migrate_repo/versions/003_add_relative_path.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.db.sqlalchemy import utils
+from oslo_db.sqlalchemy import utils
 from sqlalchemy import Column, String
 
 

tuskar/db/sqlalchemy/migrate_repo/versions/004_add_registry_path.py

@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.db.sqlalchemy import utils
+from oslo_db.sqlalchemy import utils
 from sqlalchemy import Column, String
 
 

tuskar/db/sqlalchemy/models.py

@@ -15,8 +15,8 @@
 Tuskar domain models for use with SQLAlchemy.
 """
 
-from oslo.config import cfg
-from oslo.db.sqlalchemy import models
+from oslo_config import cfg
+from oslo_db.sqlalchemy import models
 
 from sqlalchemy import (Column, ForeignKey, Integer, String, Text)
 from sqlalchemy.ext.declarative import declarative_base

tuskar/heat/client.py

@@ -23,7 +23,7 @@
 
 from os import environ as env
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.openstack.common import log as logging
 

tuskar/heat/template_tools.py

@@ -18,7 +18,7 @@ from upstream tripleo-heat-templates.
 
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from tripleo_heat_merge import merge
 
 

tuskar/netconf.py

@@ -17,7 +17,7 @@
 
 import socket
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 

tuskar/openstack/common/config/generator.py

@@ -27,7 +27,7 @@ import socket
 import sys
 import textwrap
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 import stevedore.named
 

tuskar/openstack/common/log.py

@@ -37,7 +37,7 @@ import re
 import sys
 import traceback
 
-from oslo.config import cfg
+from oslo_config import cfg
 import six
 from six import moves
 

tuskar/storage/__init__.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.openstack.common import log as logging
 

tuskar/storage/drivers/sqlalchemy.py

@@ -16,7 +16,7 @@ from __future__ import absolute_import
 
 from uuid import uuid4
 
-from oslo.config import cfg
+from oslo_config import cfg
 from sqlalchemy import and_
 from sqlalchemy import func
 from sqlalchemy.orm.exc import NoResultFound

tuskar/tests/api/api.py

@@ -14,7 +14,7 @@
 # under the License.
 
 
-from oslo.config import cfg
+from oslo_config import cfg
 import pecan
 import pecan.testing
 

tuskar/tests/base.py

@@ -28,7 +28,7 @@ import os
 import shutil
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 import unittest2
 

tuskar/tests/conf_fixture.py

@@ -15,7 +15,7 @@
 #    under the License.
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 
 from tuskar.common import config
 

tuskar/tests/storage/drivers/test_sqlalchemy.py

@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-from oslo.db.sqlalchemy import test_base
+from oslo_db.sqlalchemy import test_base
 
 from tuskar.storage.drivers import sqlalchemy
 from tuskar.tests.storage.drivers import base