Combined fix to get past broken state of repo

This patch includes several separate sets of changes which
have been reviewed individually but must be submitted
together to get past the newly updated version of pep8
and changes to the nova code base.

1. Replace our CONF object with the one from openstack.common.cfg.
   There's no need to use our own, especially since some option
   are already registered on it for us.

   Signed-off-by: Julien Danjou <julien.danjou@enovance.com>

2. Instead of importing the RPC code from nova, use
   the openstack.common.rpc package. This change
   copies that code in from openstack-common, changes
   the imports throughout ceilometer, and fixes the
   way the configuration settings are initialized.

3. Resolve PEP-8 issues introduced by an even more
   pedantic version of pep8 (1.3.1). Some of the
   changes are fixed, and some warnings/errors are
   suppressed.

4. Ignore import errors in impl_qpid because the qpid
   package is not installed on the stackforge test server.

5. Fix missing imports from gettextutils in openstack.common.

Change-Id: I0ee7d4b3278d8ff1951ca27592e3be8a87fe4854

1 files changed, 12 insertions, 14 deletions

diff --git a/setup.py b/setup.py
index ae18037f..b8f954da 100755
--- a/setup.py
+++ b/setup.py
@@ -31,18 +31,16 @@ setuptools.setup(
     test_suite='nose.collector',
     scripts=['bin/ceilometer-agent', 'bin/ceilometer-collector'],
     py_modules=[],
-    entry_points={
-        'ceilometer.collector.compute': [
-          'instance = ceilometer.compute.notifications:InstanceNotifications',
-            ],
-        'ceilometer.poll.compute': [
-            'libvirt_diskio = ceilometer.compute.libvirt:DiskIOPollster',
-            'libvirt_cpu = ceilometer.compute.libvirt:CPUPollster',
-            'network_floatingip'
-            '= ceilometer.compute.network:FloatingIPPollster',
-            ],
-        'ceilometer.storage': [
-            'log = ceilometer.storage.impl_log:LogStorage',
-            ],
-        },
+    entry_points="""
+    [ceilometer.collector.compute]
+    instance = ceilometer.compute.notifications:InstanceNotifications
+
+    [ceilometer.poll.compute]
+    libvirt_diskio = ceilometer.compute.libvirt:DiskIOPollster
+    libvirt_cpu = ceilometer.compute.libvirt:CPUPollster
+    network_floatingip = ceilometer.compute.network:FloatingIPPollster
+
+    [ceilometer.storage]
+    log = ceilometer.storage.impl_log:LogStorage
+    """,
     )