Use oslo-config-2013.1b3

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.1b3 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.

Retain dummy cfg.py file until keystoneclient middleware has been
updated (I18c450174277c8e2d15ed93879da6cd92074c27a).

Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc

bin/cinder-clear-rabbit-queues

@@ -40,14 +40,14 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
 gettext.install('cinder', unicode=1)
 
 
+from oslo.config import cfg
+
 from cinder import context
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import rpc
 
-
 delete_exchange_opt = \
     cfg.BoolOpt('delete_exchange',
                 default=False,

bin/cinder-manage

@@ -74,12 +74,13 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
 
 gettext.install('cinder', unicode=1)
 
+from oslo.config import cfg
+
 from cinder import context
 from cinder import db
 from cinder.db import migration
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import rpc
 from cinder import utils

cinder/api/middleware/auth.py

@@ -20,17 +20,16 @@ Common Auth Middleware.
 """
 import os
 
+from oslo.config import cfg
 import webob.dec
 import webob.exc
 
 from cinder.api.openstack import wsgi
 from cinder import context
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder import wsgi as base_wsgi
 
-
 use_forwarded_for_opt = cfg.BoolOpt(
     'use_forwarded_for',
     default=False,

cinder/api/middleware/sizelimit.py

@@ -18,15 +18,14 @@ Request Body limiting middleware.
 
 """
 
+from oslo.config import cfg
 import webob.dec
 import webob.exc
 
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder import wsgi
 
-
 #default request size is 112k
 max_request_body_size_opt = cfg.IntOpt('osapi_max_request_body_size',
                                        default=114688,

cinder/db/api.py

@@ -43,12 +43,12 @@ these objects be simple dictionaries.
 
 """
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder import utils
 
-
 db_opts = [
     cfg.StrOpt('db_backend',
                default='sqlalchemy',

cinder/db/base.py

@@ -18,10 +18,10 @@
 
 """Base class for classes that need modular database access."""
 
-from cinder import flags
+from oslo.config import cfg
-from cinder.openstack.common import cfg
-from cinder.openstack.common import importutils
 
+from cinder import flags
+from cinder.openstack.common import importutils
 
 db_driver_opt = cfg.StrOpt('db_driver',
                            default='cinder.db',

cinder/exception.py

@@ -24,10 +24,10 @@ SHOULD include dedicated exception logging.
 
 """
 
+from oslo.config import cfg
 import webob.exc
 
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/flags.py

@@ -30,8 +30,7 @@ import os
 import socket
 import sys
 
-from cinder.openstack.common import cfg
+from oslo.config import cfg
-
 
 FLAGS = cfg.CONF
 

cinder/image/image_utils.py

@@ -29,13 +29,13 @@ import os
 import re
 import tempfile
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder import utils
 
-
 LOG = logging.getLogger(__name__)
 
 image_helper_opt = [cfg.StrOpt('image_conversion_dir',

cinder/openstack/common/iniparser.py

@@ -1,130 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2012 OpenStack LLC.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-
-class ParseError(Exception):
-    def __init__(self, message, lineno, line):
-        self.msg = message
-        self.line = line
-        self.lineno = lineno
-
-    def __str__(self):
-        return 'at line %d, %s: %r' % (self.lineno, self.msg, self.line)
-
-
-class BaseParser(object):
-    lineno = 0
-    parse_exc = ParseError
-
-    def _assignment(self, key, value):
-        self.assignment(key, value)
-        return None, []
-
-    def _get_section(self, line):
-        if line[-1] != ']':
-            return self.error_no_section_end_bracket(line)
-        if len(line) <= 2:
-            return self.error_no_section_name(line)
-
-        return line[1:-1]
-
-    def _split_key_value(self, line):
-        colon = line.find(':')
-        equal = line.find('=')
-        if colon < 0 and equal < 0:
-            return self.error_invalid_assignment(line)
-
-        if colon < 0 or (equal >= 0 and equal < colon):
-            key, value = line[:equal], line[equal + 1:]
-        else:
-            key, value = line[:colon], line[colon + 1:]
-
-        value = value.strip()
-        if ((value and value[0] == value[-1]) and
-                (value[0] == "\"" or value[0] == "'")):
-            value = value[1:-1]
-        return key.strip(), [value]
-
-    def parse(self, lineiter):
-        key = None
-        value = []
-
-        for line in lineiter:
-            self.lineno += 1
-
-            line = line.rstrip()
-            if not line:
-                # Blank line, ends multi-line values
-                if key:
-                    key, value = self._assignment(key, value)
-                continue
-            elif line[0] in (' ', '\t'):
-                # Continuation of previous assignment
-                if key is None:
-                    self.error_unexpected_continuation(line)
-                else:
-                    value.append(line.lstrip())
-                continue
-
-            if key:
-                # Flush previous assignment, if any
-                key, value = self._assignment(key, value)
-
-            if line[0] == '[':
-                # Section start
-                section = self._get_section(line)
-                if section:
-                    self.new_section(section)
-            elif line[0] in '#;':
-                self.comment(line[1:].lstrip())
-            else:
-                key, value = self._split_key_value(line)
-                if not key:
-                    return self.error_empty_key(line)
-
-        if key:
-            # Flush previous assignment, if any
-            self._assignment(key, value)
-
-    def assignment(self, key, value):
-        """Called when a full assignment is parsed"""
-        raise NotImplementedError()
-
-    def new_section(self, section):
-        """Called when a new section is started"""
-        raise NotImplementedError()
-
-    def comment(self, comment):
-        """Called when a comment is parsed"""
-        pass
-
-    def error_invalid_assignment(self, line):
-        raise self.parse_exc("No ':' or '=' found in assignment",
-                             self.lineno, line)
-
-    def error_empty_key(self, line):
-        raise self.parse_exc('Key cannot be empty', self.lineno, line)
-
-    def error_unexpected_continuation(self, line):
-        raise self.parse_exc('Unexpected continuation line',
-                             self.lineno, line)
-
-    def error_no_section_end_bracket(self, line):
-        raise self.parse_exc('Invalid section (must end with ])',
-                             self.lineno, line)
-
-    def error_no_section_name(self, line):
-        raise self.parse_exc('Empty section name', self.lineno, line)

cinder/openstack/common/lockutils.py

@@ -25,13 +25,12 @@ import time
 import weakref
 
 from eventlet import semaphore
+from oslo.config import cfg
 
-from cinder.openstack.common import cfg
 from cinder.openstack.common import fileutils
 from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 
-
 LOG = logging.getLogger(__name__)
 
 

cinder/openstack/common/log.py

@@ -40,13 +40,13 @@ import stat
 import sys
 import traceback
 
-from cinder.openstack.common import cfg
+from oslo.config import cfg
+
 from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import local
 from cinder.openstack.common import notifier
 
-
 _DEFAULT_LOG_FORMAT = "%(asctime)s %(levelname)8s [%(name)s] %(message)s"
 _DEFAULT_LOG_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
 

cinder/openstack/common/notifier/api.py

@@ -15,7 +15,8 @@
 
 import uuid
 
-from cinder.openstack.common import cfg
+from oslo.config import cfg
+
 from cinder.openstack.common import context
 from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
@@ -23,7 +24,6 @@ from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 
-
 LOG = logging.getLogger(__name__)
 
 notifier_opts = [

cinder/openstack/common/notifier/log_notifier.py

@@ -13,12 +13,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
 
-from cinder.openstack.common import cfg
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common import log as logging
 
-
 CONF = cfg.CONF
 
 

cinder/openstack/common/rpc/__init__.py

@@ -25,9 +25,9 @@ For some wrappers that add message versioning to rpc, see:
     rpc.proxy
 """
 
-from cinder.openstack.common import cfg
+from oslo.config import cfg
-from cinder.openstack.common import importutils
 
+from cinder.openstack.common import importutils
 
 rpc_opts = [
     cfg.StrOpt('rpc_backend',

cinder/openstack/common/rpc/amqp.py

@@ -33,14 +33,13 @@ import uuid
 from eventlet import greenpool
 from eventlet import pools
 from eventlet import semaphore
+from oslo.config import cfg
 
-from cinder.openstack.common import cfg
 from cinder.openstack.common import excutils
 from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import local
 from cinder.openstack.common.rpc import common as rpc_common
 
-
 LOG = logging.getLogger(__name__)
 
 

cinder/openstack/common/rpc/impl_kombu.py

@@ -28,8 +28,8 @@ import kombu
 import kombu.connection
 import kombu.entity
 import kombu.messaging
+from oslo.config import cfg
 
-from cinder.openstack.common import cfg
 from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import network_utils
 from cinder.openstack.common.rpc import amqp as rpc_amqp

cinder/openstack/common/rpc/impl_qpid.py

@@ -23,10 +23,10 @@ import uuid
 
 import eventlet
 import greenlet
+from oslo.config import cfg
 import qpid.messaging
 import qpid.messaging.exceptions
 
-from cinder.openstack.common import cfg
 from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common.rpc import amqp as rpc_amqp

cinder/openstack/common/rpc/impl_zmq.py

@@ -24,14 +24,13 @@ import uuid
 import eventlet
 from eventlet.green import zmq
 import greenlet
+from oslo.config import cfg
 
-from cinder.openstack.common import cfg
 from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import jsonutils
 from cinder.openstack.common.rpc import common as rpc_common
 
-
 # for convenience, are not modified.
 pformat = pprint.pformat
 Timeout = eventlet.timeout.Timeout

cinder/openstack/common/rpc/matchmaker.py

@@ -23,9 +23,9 @@ import itertools
 import json
 import logging
 
-from cinder.openstack.common import cfg
+from oslo.config import cfg
-from cinder.openstack.common.gettextutils import _
 
+from cinder.openstack.common.gettextutils import _
 
 matchmaker_opts = [
     # Matchmaker ring file

cinder/policy.py

@@ -17,13 +17,13 @@
 
 """Policy Engine For Cinder"""
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import policy
 from cinder import utils
 
-
 policy_opts = [
     cfg.StrOpt('policy_file',
                default='policy.json',

cinder/quota.py

@@ -20,15 +20,15 @@
 
 import datetime
 
+from oslo.config import cfg
+
 from cinder import db
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 
-
 LOG = logging.getLogger(__name__)
 
 quota_opts = [

cinder/scheduler/driver.py

@@ -21,15 +21,15 @@
 Scheduler base class that all Schedulers should inherit from
 """
 
+from oslo.config import cfg
+
 from cinder import db
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import importutils
 from cinder.openstack.common import timeutils
 from cinder import utils
 from cinder.volume import rpcapi as volume_rpcapi
 
-
 scheduler_driver_opts = [
     cfg.StrOpt('scheduler_host_manager',
                default='cinder.scheduler.host_manager.HostManager',

cinder/scheduler/host_manager.py

@@ -19,17 +19,17 @@ Manage hosts in the current zone.
 
 import UserDict
 
+from oslo.config import cfg
+
 from cinder import db
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.scheduler import filters
 from cinder.openstack.common.scheduler import weights
 from cinder.openstack.common import timeutils
 from cinder import utils
 
-
 host_manager_opts = [
     cfg.ListOpt('scheduler_default_filters',
                 default=[

cinder/scheduler/manager.py

@@ -21,19 +21,19 @@
 Scheduler Service
 """
 
+from oslo.config import cfg
+
 from cinder import context
 from cinder import db
 from cinder import exception
 from cinder import flags
 from cinder import manager
-from cinder.openstack.common import cfg
 from cinder.openstack.common import excutils
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.notifier import api as notifier
 from cinder.volume import rpcapi as volume_rpcapi
 
-
 LOG = logging.getLogger(__name__)
 
 scheduler_driver_opt = cfg.StrOpt('scheduler_driver',

cinder/scheduler/scheduler_options.py

@@ -26,12 +26,12 @@ import datetime
 import json
 import os
 
+from oslo.config import cfg
+
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 
-
 scheduler_json_config_location_opt = cfg.StrOpt(
         'scheduler_json_config_location',
         default='',

cinder/scheduler/simple.py

@@ -21,15 +21,15 @@
 Simple Scheduler
 """
 
+from oslo.config import cfg
+
 from cinder import db
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.scheduler import chance
 from cinder.scheduler import driver
 from cinder import utils
 
-
 simple_scheduler_opts = [
     cfg.IntOpt("max_gigabytes",
                default=10000,

cinder/scheduler/weights/capacity.py

@@ -22,10 +22,10 @@ number and the weighing has the opposite effect of the default.
 
 import math
 
-from cinder import flags
+from oslo.config import cfg
-from cinder.openstack.common import cfg
-from cinder.openstack.common.scheduler import weights
 
+from cinder import flags
+from cinder.openstack.common.scheduler import weights
 
 capacity_weight_opts = [
         cfg.FloatOpt('capacity_weight_multiplier',

cinder/service.py

@@ -29,12 +29,12 @@ import time
 
 import eventlet
 import greenlet
+from oslo.config import cfg
 
 from cinder import context
 from cinder import db
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import rpc
@@ -42,7 +42,6 @@ from cinder import utils
 from cinder import version
 from cinder import wsgi
 
-
 LOG = logging.getLogger(__name__)
 
 service_opts = [

cinder/test.py

@@ -29,17 +29,16 @@ import uuid
 
 import mox
 import nose.plugins.skip
+from oslo.config import cfg
 import stubout
 
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import timeutils
 from cinder import service
 from cinder import tests
 from cinder.tests import fake_flags
 
-
 test_opts = [
     cfg.StrOpt('sqlite_clean_db',
                default='clean.sqlite',

cinder/tests/api/v1/test_volume_metadata.py

@@ -17,6 +17,7 @@
 
 import uuid
 
+from oslo.config import cfg
 import webob
 
 from cinder.api import extensions
@@ -24,7 +25,6 @@ from cinder.api.v1 import volume_metadata
 from cinder.api.v1 import volumes
 import cinder.db
 from cinder import exception
-from cinder.openstack.common import cfg
 from cinder.openstack.common import jsonutils
 from cinder import test
 from cinder.tests.api import fakes

cinder/tests/declare_flags.py

@@ -16,8 +16,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
+
 from cinder import flags
-from cinder.openstack.common import cfg
 
 FLAGS = flags.FLAGS
 FLAGS.register_opt(cfg.IntOpt('answer', default=42, help='test flag'))

cinder/tests/runtime_flags.py

@@ -16,8 +16,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
+
 from cinder import flags
-from cinder.openstack.common import cfg
 
 FLAGS = flags.FLAGS
 FLAGS.register_opt(cfg.IntOpt('runtime_answer', default=54, help='test flag'))

cinder/tests/test_flags.py

@@ -17,9 +17,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
 
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder import test
 
 FLAGS = flags.FLAGS

cinder/tests/test_service.py

@@ -21,18 +21,17 @@ Unit Tests for remote procedure calls using queue
 """
 
 import mox
+from oslo.config import cfg
 
 from cinder import context
 from cinder import db
 from cinder import exception
 from cinder import flags
 from cinder import manager
-from cinder.openstack.common import cfg
 from cinder import service
 from cinder import test
 from cinder import wsgi
 
-
 test_service_opts = [
     cfg.StrOpt("fake_manager",
                default="cinder.tests.test_service.FakeManager",

cinder/tests/test_wsgi.py

@@ -23,12 +23,13 @@ import ssl
 import tempfile
 import unittest
 import urllib2
+
+from oslo.config import cfg
 import webob
 import webob.dec
 
 from cinder.api.middleware import fault
 from cinder import exception
-from cinder.openstack.common import cfg
 from cinder import test
 from cinder import utils
 import cinder.wsgi

cinder/volume/api.py

@@ -22,12 +22,13 @@ Handles all requests relating to volumes.
 
 import functools
 
+from oslo.config import cfg
+
 from cinder.db import base
 from cinder.db.sqlalchemy import models
 from cinder import exception
 from cinder import flags
 from cinder.image import glance
-from cinder.openstack.common import cfg
 from cinder.openstack.common import excutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import rpc

cinder/volume/driver.py

@@ -24,15 +24,15 @@ import os
 import socket
 import time
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
 from cinder.image import image_utils
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume.configuration import Configuration
 
-
 LOG = logging.getLogger(__name__)
 
 volume_opts = [

cinder/volume/drivers/coraid.py

@@ -20,20 +20,20 @@ Require : Coraid EtherCloud ESM, Coraid VSX and Coraid SRX.
 Author  : Jean-Baptiste RANSY <openstack@alyseo.com>
 """
 
-from cinder import context
-from cinder import exception
-from cinder import flags
-from cinder.openstack.common import cfg
-from cinder.openstack.common import jsonutils
-from cinder.openstack.common import log as logging
-from cinder.volume import driver
-from cinder.volume import volume_types
-
 import cookielib
 import os
 import time
 import urllib2
 
+from oslo.config import cfg
+
+from cinder import context
+from cinder import exception
+from cinder import flags
+from cinder.openstack.common import jsonutils
+from cinder.openstack.common import log as logging
+from cinder.volume import driver
+from cinder.volume import volume_types
 
 LOG = logging.getLogger(__name__)
 

cinder/volume/drivers/emc/emc_smis_common.py

@@ -24,11 +24,12 @@ It supports VNX and VMAX arrays.
 """
 
 import time
+
+from oslo.config import cfg
 from xml.dom.minidom import parseString
 
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

cinder/volume/drivers/glusterfs.py

@@ -18,9 +18,10 @@
 import errno
 import os
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers import nfs
 

cinder/volume/drivers/lvm.py

@@ -24,10 +24,11 @@ import math
 import os
 import re
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
 from cinder.image import image_utils
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import driver

cinder/volume/drivers/netapp/iscsi.py

@@ -24,16 +24,15 @@ ONTAP 7-mode storage systems with installed iSCSI licenses.
 """
 
 import time
+import uuid
 
+from oslo.config import cfg
 import suds
 from suds import client
 from suds.sax import text
 
-import uuid
-
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume.drivers.netapp.api import NaApiError

cinder/volume/drivers/netapp/nfs.py

@@ -19,13 +19,14 @@ Volume driver for NetApp NFS storage.
 """
 
 import os
+import time
+
+from oslo.config import cfg
 import suds
 from suds.sax import text
-import time
 
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.netapp.api import NaApiError
 from cinder.volume.drivers.netapp.api import NaElement

cinder/volume/drivers/nexenta/volume.py

@@ -22,9 +22,10 @@
 .. moduleauthor:: Yuriy Taraday <yorik.sar@gmail.com>
 """
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume.drivers import nexenta

cinder/volume/drivers/nfs.py

@@ -19,9 +19,10 @@ import errno
 import hashlib
 import os
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 

cinder/volume/drivers/rbd.py

@@ -19,15 +19,15 @@ import os
 import tempfile
 import urllib
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
 from cinder.image import image_utils
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import driver
 
-
 LOG = logging.getLogger(__name__)
 
 rbd_opts = [

cinder/volume/drivers/san/hp/hp_3par_common.py

@@ -43,17 +43,16 @@ import uuid
 
 from eventlet import greenthread
 from hp3parclient import exceptions as hpexceptions
+from oslo.config import cfg
 
 from cinder import context
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import volume_types
 
-
 LOG = logging.getLogger(__name__)
 
 hp3par_opts = [

cinder/volume/drivers/san/san.py

@@ -24,15 +24,14 @@ controller on the SAN hardware.  We expect to access it over SSH or some API.
 import random
 
 from eventlet import greenthread
+from oslo.config import cfg
 
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume.driver import ISCSIDriver
 
-
 LOG = logging.getLogger(__name__)
 
 san_opts = [

cinder/volume/drivers/san/solaris.py

@@ -12,13 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.san.san import SanISCSIDriver
 
-
 LOG = logging.getLogger(__name__)
 
 solaris_opts = [

cinder/volume/drivers/solidfire.py

@@ -25,10 +25,11 @@ import string
 import time
 import uuid
 
+from oslo.config import cfg
+
 from cinder import context
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.san.san import SanISCSIDriver
 from cinder.volume import volume_types

cinder/volume/drivers/storwize_svc.py

@@ -45,10 +45,11 @@ import re
 import string
 import time
 
+from oslo.config import cfg
+
 from cinder import context
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import excutils
 from cinder.openstack.common import log as logging
 from cinder import utils

cinder/volume/drivers/windows.py

@@ -23,9 +23,10 @@ This driver requires ISCSI target role installed
 import os
 import sys
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 

cinder/volume/drivers/xenapi/sm.py

@@ -16,16 +16,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from oslo.config import cfg
 
 from cinder import exception
 from cinder import flags
 from cinder.image import glance
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder.volume import driver
 from cinder.volume.drivers.xenapi import lib as xenapi_lib
 
-
 LOG = logging.getLogger(__name__)
 
 xenapi_opts = [

cinder/volume/drivers/xiv.py

@@ -24,9 +24,10 @@
 Volume driver for IBM XIV storage systems.
 """
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import importutils
 from cinder.openstack.common import log as logging
 from cinder.volume.drivers.san import san

cinder/volume/drivers/zadara.py

@@ -23,17 +23,16 @@ This driver requires VPSA with API ver.12.06 or higher.
 
 import httplib
 
+from lxml import etree
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder import utils
 from cinder.volume import driver
 from cinder.volume import iscsi
 
-from lxml import etree
-
-
 LOG = logging.getLogger("cinder.volume.driver")
 
 zadara_opts = [

cinder/volume/iscsi.py

@@ -22,9 +22,10 @@ Helper code for the iSCSI volume driver.
 import os
 import re
 
+from oslo.config import cfg
+
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder import utils
 

cinder/volume/manager.py

@@ -41,12 +41,13 @@ intact.
 import sys
 import traceback
 
+from oslo.config import cfg
+
 from cinder import context
 from cinder import exception
 from cinder import flags
 from cinder.image import glance
 from cinder import manager
-from cinder.openstack.common import cfg
 from cinder.openstack.common import excutils
 from cinder.openstack.common import importutils
 from cinder.openstack.common import lockutils
@@ -58,7 +59,6 @@ from cinder.volume.configuration import Configuration
 from cinder.volume import utils as volume_utils
 from cinder.volume import volume_types
 
-
 LOG = logging.getLogger(__name__)
 
 QUOTAS = quota.QUOTAS

cinder/wsgi.py

@@ -29,6 +29,7 @@ import time
 import eventlet
 import eventlet.wsgi
 import greenlet
+from oslo.config import cfg
 from paste import deploy
 import routes.middleware
 import webob.dec
@@ -36,7 +37,6 @@ import webob.exc
 
 from cinder import exception
 from cinder import flags
-from cinder.openstack.common import cfg
 from cinder.openstack.common import log as logging
 from cinder import utils
 

openstack-common.conf

@@ -1,7 +1,7 @@
 [DEFAULT]
 
 # The list of modules to copy from openstack-common
-modules=cfg,exception,excutils,gettextutils,importutils,iniparser,jsonutils,local,rootwrap,rpc,timeutils,log,setup,notifier,context,network_utils,policy,uuidutils,lockutils,fileutils,gettextutils,scheduler,scheduler.filters,scheduler.weights,install_venv_common,flakes,version
+modules=exception,excutils,gettextutils,importutils,jsonutils,local,rootwrap,rpc,timeutils,log,setup,notifier,context,network_utils,policy,uuidutils,lockutils,fileutils,gettextutils,scheduler,scheduler.filters,scheduler.weights,install_venv_common,flakes,version
 
 # The base module to hold the copy of openstack.common
 base=cinder

setup.py

@@ -21,6 +21,7 @@ import setuptools
 from cinder.openstack.common import setup as common_setup
 
 requires = common_setup.parse_requirements()
+depend_links = common_setup.parse_dependency_links()
 project = 'cinder'
 
 filters = [
@@ -62,6 +63,7 @@ setuptools.setup(
     cmdclass=common_setup.get_cmdclass(),
     packages=setuptools.find_packages(exclude=['bin', 'smoketests']),
     install_requires=requires,
+    dependency_links=depend_links,
     entry_points={
         'cinder.scheduler.filters': filters,
         'cinder.scheduler.weights': weights,

tools/conf/extract_opts.py

@@ -24,9 +24,9 @@ import socket
 import sys
 import textwrap
 
-from cinder.openstack.common import cfg
+from oslo.config import cfg
-from cinder.openstack.common import importutils
 
+from cinder.openstack.common import importutils
 
 STROPT = "StrOpt"
 BOOLOPT = "BoolOpt"

tools/install_venv_common.py

@@ -31,7 +31,7 @@ if os.path.exists(os.path.join(possible_topdir, "cinder",
     sys.path.insert(0, possible_topdir)
 
 
-from cinder.openstack.common import cfg
+from oslo.config import cfg
 
 
 class InstallVenv(object):

tools/pip-requires

@@ -22,3 +22,4 @@ setuptools_git>=0.4
 python-glanceclient>=0.5.0,<2
 python-keystoneclient>=0.2.0
 rtslib>=2.1.fb27
+http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config

tox.ini

@@ -13,7 +13,6 @@ deps = -r{toxinidir}/tools/pip-requires
 commands = /bin/bash run_tests.sh -N -P {posargs}
 
 [testenv:pep8]
-deps = pep8==1.3.3
 commands =
   python tools/hacking.py --ignore=N4,E125,E126,E711,E712 --repeat --show-source \
       --exclude=.venv,.tox,dist,doc,openstack,*egg  .