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.

For each testenv in tox.ini which overrides the base testenv deps list,
explicitly include {pip,test}-requires in the list so that oslo-config
doesn't fail to install later when easy_install attempts to install
the tarball when doing 'python setup.py install'.

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

Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc

8 files changed, 16 insertions, 8 deletions

diff --git a/bin/ceilometer-agent-central b/bin/ceilometer-agent-central
index 68742f96..67cb6304 100755
--- a/bin/ceilometer-agent-central
+++ b/bin/ceilometer-agent-central
@@ -21,10 +21,11 @@ import eventlet
 eventlet.monkey_patch()
 import sys
 
+from oslo.config import cfg
+
 from ceilometer import service as ceilo_service
 from ceilometer.central import manager
 from ceilometer.service import prepare_service
-from ceilometer.openstack.common import cfg
 from ceilometer.openstack.common import service
 
 if __name__ == '__main__':
diff --git a/bin/ceilometer-agent-compute b/bin/ceilometer-agent-compute
index d03a34cb..4ebce510 100755
--- a/bin/ceilometer-agent-compute
+++ b/bin/ceilometer-agent-compute
@@ -21,10 +21,11 @@ import eventlet
 eventlet.monkey_patch()
 import sys
 
+from oslo.config import cfg
+
 from ceilometer import service as ceilo_service
 from ceilometer.compute import manager
 from ceilometer.service import prepare_service
-from ceilometer.openstack.common import cfg
 from ceilometer.openstack.common import service
 
 
diff --git a/bin/ceilometer-api b/bin/ceilometer-api
index c2cff2a8..fc6da730 100755
--- a/bin/ceilometer-api
+++ b/bin/ceilometer-api
@@ -20,9 +20,10 @@
 """
 import sys
 
+from oslo.config import cfg
+
 from ceilometer.api.v1 import app
 from ceilometer import service
-from ceilometer.openstack.common import cfg
 
 
 if __name__ == '__main__':
diff --git a/bin/ceilometer-api-v2 b/bin/ceilometer-api-v2
index 40ff83ed..a1b99df4 100755
--- a/bin/ceilometer-api-v2
+++ b/bin/ceilometer-api-v2
@@ -22,9 +22,10 @@ import os
 import sys
 from wsgiref import simple_server
 
+from oslo.config import cfg
+
 from ceilometer.api import app
 from ceilometer import service
-from ceilometer.openstack.common import cfg
 from ceilometer.openstack.common import log as logging
 
 
diff --git a/bin/ceilometer-collector b/bin/ceilometer-collector
index 386fecee..4fa81513 100755
--- a/bin/ceilometer-collector
+++ b/bin/ceilometer-collector
@@ -21,10 +21,10 @@ import eventlet
 eventlet.monkey_patch()
 import sys
 
+from oslo.config import cfg
 
 from ceilometer.collector import service as coll_service
 from ceilometer.service import prepare_service
-from ceilometer.openstack.common import cfg
 from ceilometer.openstack.common import service
 
 
diff --git a/bin/ceilometer-dbsync b/bin/ceilometer-dbsync
index 0eaf6ae7..26eb7486 100755
--- a/bin/ceilometer-dbsync
+++ b/bin/ceilometer-dbsync
@@ -19,9 +19,11 @@
 """
 
 import sys
+
+from oslo.config import cfg
+
 from ceilometer import service
 from ceilometer import storage
-from ceilometer.openstack.common import cfg
 
 if __name__ == '__main__':
     service.prepare_service(sys.argv)
diff --git a/bin/ceilometer-rpc-zmq-receiver b/bin/ceilometer-rpc-zmq-receiver
index 41a9307a..8ac28b6e 100755
--- a/bin/ceilometer-rpc-zmq-receiver
+++ b/bin/ceilometer-rpc-zmq-receiver
@@ -30,7 +30,8 @@ POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'ceilometer', '__init__.py')):
     sys.path.insert(0, POSSIBLE_TOPDIR)
 
-from ceilometer.openstack.common import cfg
+from oslo.config import cfg
+
 from ceilometer.openstack.common import log as logging
 from ceilometer.openstack.common import rpc
 from ceilometer.openstack.common.rpc import impl_zmq
diff --git a/bin/ceilometer-send-counter b/bin/ceilometer-send-counter
index 4bda103c..76f36cdc 100755
--- a/bin/ceilometer-send-counter
+++ b/bin/ceilometer-send-counter
@@ -23,9 +23,10 @@
 import logging
 import sys
 
+from oslo.config import cfg
+
 from ceilometer import counter
 from ceilometer import publish
-from ceilometer.openstack.common import cfg
 from ceilometer.openstack.common import timeutils
 from ceilometer.openstack.common import context