Merge "Remove compat cfg wrapper"

ceilometer/openstack/common/cfg.py

@@ -1,17 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright 2013 Red Hat, Inc.
-#
-#    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.
-
-from oslo.config.cfg import *

ceilometer/storage/sqlalchemy/models.py

@@ -19,14 +19,15 @@ SQLAlchemy models for nova data.
 """
 
 import json
+from urlparse import urlparse
+
+from oslo.config import cfg
 from sqlalchemy import Column, Integer, String, Table
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy import ForeignKey, DateTime
 from sqlalchemy.orm import relationship
 from sqlalchemy.types import TypeDecorator, VARCHAR
-from urlparse import urlparse
 
-import ceilometer.openstack.common.cfg as cfg
 from ceilometer.openstack.common import timeutils
 
 sql_opts = [

ceilometer/storage/sqlalchemy/session.py

@@ -21,12 +21,12 @@
 import re
 import time
 
+from oslo.config import cfg
 import sqlalchemy
 from sqlalchemy.exc import DisconnectionError, OperationalError
 import sqlalchemy.orm
 from sqlalchemy.pool import NullPool, StaticPool
 
-import ceilometer.openstack.common.cfg as cfg
 import ceilometer.openstack.common.log as logging
 
 LOG = logging.getLogger(__name__)

tools/pip-requires

@@ -21,4 +21,4 @@ requests<1.0
 extras
 wsme>=0.5b1
 pyyaml
-http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b3.tar.gz#egg=oslo-config
+http://tarballs.openstack.org/oslo-config/oslo-config-2013.1b4.tar.gz#egg=oslo-config