Move from oslo.config to oslo_config

oslo_config was moved out of the oslo namespace in oslo.config>=1.6.0.

This updates the required version of oslo.config.

Related-to: blueprint drop-namespace-packages

Change-Id: I18f86c4f2838a14de344ef7887353ca0b5f1a1dd

glance_store/_drivers/cinder.py

@@ -17,7 +17,7 @@ import logging
 from cinderclient import exceptions as cinder_exception
 from cinderclient import service_catalog
 from cinderclient.v2 import client as cinderclient
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance_store.common import utils
 import glance_store.driver

glance_store/_drivers/filesystem.py

@@ -25,8 +25,8 @@ import os
 import stat
 import urlparse
 
-from oslo.config import cfg
 from oslo.serialization import jsonutils
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import units
 

glance_store/_drivers/gridfs.py

@@ -19,7 +19,7 @@ from __future__ import absolute_import
 import logging
 import urlparse
 
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 
 import glance_store.driver

glance_store/_drivers/rbd.py

@@ -23,7 +23,7 @@ import logging
 import math
 import urllib
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 from glance_store.common import utils
 from glance_store import driver

glance_store/_drivers/s3.py

@@ -25,7 +25,7 @@ import urlparse
 
 import boto.exception
 import eventlet
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import netutils
 from oslo_utils import units
 import six

glance_store/_drivers/sheepdog.py

@@ -19,7 +19,7 @@ import hashlib
 import logging
 
 from oslo.concurrency import processutils
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import units
 

glance_store/_drivers/vmware_datastore.py

@@ -21,8 +21,8 @@ import logging
 import os
 import socket
 
-from oslo.config import cfg
 from oslo.vmware import api
+from oslo_config import cfg
 from oslo_utils import excutils
 from oslo_utils import units
 import six.moves.urllib.parse as urlparse

glance_store/common/config.py

@@ -22,7 +22,7 @@ import logging.config
 import logging.handlers
 import os
 
-from oslo.config import cfg
+from oslo_config import cfg
 from paste import deploy
 
 from glance.version import version_info as version

glance_store/tests/base.py

@@ -18,7 +18,7 @@ import os
 import shutil
 
 import fixtures
-from oslo.config import cfg
+from oslo_config import cfg
 from oslotest import base
 
 import glance_store as store

requirements.txt

@@ -1,4 +1,4 @@
-oslo.config>=1.2.0
+oslo.config>=1.6.0 # Apache-2.0
 oslo.i18n>=0.1.0
 oslo.serialization>=1.0.0 # Apache-2.0
 oslo.utils>=1.2.0 # Apache-2.0

tests/unit/test_swift_store.py

@@ -24,7 +24,7 @@ import tempfile
 import uuid
 
 import httpretty
-from oslo.config import cfg
+from oslo_config import cfg
 from oslo_utils import units
 from oslotest import moxstubout
 import six