From df5ac5b2f2cf984dd32e77c963aac66452c23b44 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Sat, 23 Feb 2013 09:53:55 +0000
Subject: [PATCH] Remove compat cfg wrapper

This wrapper was there to allow oslo-config changes through the gate
while keystoneclient hadn't been updated.

Also update to 2013.1b4.

Change-Id: I3d48673af58ae379e8e4d2c7fb4b4d81f3ed67dd
---
 ceilometer/openstack/common/cfg.py       | 17 -----------------
 ceilometer/storage/sqlalchemy/models.py  |  5 +++--
 ceilometer/storage/sqlalchemy/session.py |  2 +-
 tools/pip-requires                       |  2 +-
 4 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 ceilometer/openstack/common/cfg.py

diff --git a/ceilometer/openstack/common/cfg.py b/ceilometer/openstack/common/cfg.py
deleted file mode 100644
index c35dcb845e..0000000000
--- a/ceilometer/openstack/common/cfg.py
+++ /dev/null
@@ -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 *
diff --git a/ceilometer/storage/sqlalchemy/models.py b/ceilometer/storage/sqlalchemy/models.py
index 930e706999..ea1774ca78 100644
--- a/ceilometer/storage/sqlalchemy/models.py
+++ b/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 = [
diff --git a/ceilometer/storage/sqlalchemy/session.py b/ceilometer/storage/sqlalchemy/session.py
index 8742f35911..a116c0b1ef 100644
--- a/ceilometer/storage/sqlalchemy/session.py
+++ b/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__)
diff --git a/tools/pip-requires b/tools/pip-requires
index e7335ecaaa..07345200bd 100644
--- a/tools/pip-requires
+++ b/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