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: If51059c31c82d5235e2ae21143911b5561783ca6

os_collect_config/cache.py

@@ -30,7 +30,7 @@ import os
 import shutil
 import tempfile
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 def get_path(name):

os_collect_config/cfn.py

@@ -18,7 +18,7 @@ import os
 
 from keystoneclient.contrib.ec2 import utils as ec2_utils
 from lxml import etree
-from oslo.config import cfg
+from oslo_config import cfg
 import six.moves.urllib.parse as urlparse
 
 from os_collect_config import common

os_collect_config/collect.py

@@ -22,7 +22,7 @@ import subprocess
 import sys
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from os_collect_config import cache
 from os_collect_config import cfn

os_collect_config/ec2.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from os_collect_config import common
 from os_collect_config import exc

os_collect_config/heat.py

@@ -14,7 +14,7 @@
 
 from heatclient import client as heatclient
 from keystoneclient.v3 import client as keystoneclient
-from oslo.config import cfg
+from oslo_config import cfg
 
 from os_collect_config import exc
 from os_collect_config import keystone

os_collect_config/heat_local.py

@@ -16,7 +16,7 @@
 import json
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from os_collect_config import exc
 from os_collect_config.openstack.common import log

os_collect_config/keystone.py

@@ -19,7 +19,7 @@ from dogpile import cache
 from keystoneclient import discover as ks_discover
 from keystoneclient import exceptions as ks_exc
 from keystoneclient.v3 import client as ks_keystoneclient
-from oslo.config import cfg
+from oslo_config import cfg
 
 CONF = cfg.CONF
 

os_collect_config/local.py

@@ -18,7 +18,7 @@ import locale
 import os
 import stat
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from os_collect_config import exc
 from os_collect_config.openstack.common import log

os_collect_config/openstack/common/log.py

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

os_collect_config/request.py

@@ -17,7 +17,7 @@ import calendar
 import json
 import time
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from os_collect_config import common
 from os_collect_config import exc

os_collect_config/tests/test_cfn.py

@@ -18,7 +18,7 @@ import tempfile
 
 import fixtures
 from lxml import etree
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 import six.moves.urllib.parse as urlparse
 import testtools

os_collect_config/tests/test_collect.py

@@ -24,7 +24,7 @@ import extras
 import fixtures
 from keystoneclient import discover as ks_discover
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 from testtools import matchers
 

os_collect_config/tests/test_heat.py

@@ -16,7 +16,7 @@ import fixtures
 from keystoneclient import discover as ks_discover
 from keystoneclient import exceptions as ks_exc
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 from testtools import matchers
 

os_collect_config/tests/test_heat_local.py

@@ -18,7 +18,7 @@ import os.path
 import tempfile
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 from testtools import matchers
 

os_collect_config/tests/test_keystone.py

@@ -18,7 +18,7 @@ import fixtures
 from keystoneclient import discover as ks_discover
 from keystoneclient import exceptions as ks_exc
 import mock
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 
 from os_collect_config import collect

os_collect_config/tests/test_local.py

@@ -19,7 +19,7 @@ import os
 import tempfile
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import testtools
 from testtools import matchers
 

os_collect_config/tests/test_request.py

@@ -18,7 +18,7 @@ import json
 import time
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 import requests
 import testtools
 from testtools import matchers