Add ceilometer 6.0.0

 * Update runtime requirements according to global requirements of Mitaka
 * Update build depends according to test requirements of the project
 * d/ceilometer-common.install:
   - Remove gabbi_pipeline.yaml
     because it's only for tests
   - Remove gnocchi_archive_policy_map.yaml
   - Add ceilometer-config-generator.conf
 * Synchronize build scripts from Debian.
   Source: https://anonscm.debian.org/git/openstack/ceilometer.git
   Commit: c7caa6f0ab1349e09745c17c600eb6b5d7532e4f

Change-Id: I6a16629bec5be9f39e158e46e9079415551e46f8

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 6c3cb7ba4c36c2add3903eab5908a83416624a54..ca20556ad84a7c6a91e0afa79260b5a1b1dfa493 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -35,15 +35,20 @@ if [[ `cat /etc/*-release | head -n 1 | awk '{print $1}'` =~ Ubuntu ]]; then
       ceilometer-alarm-evaluator
    )
 
-   ceilometer_services=("${ceilometer_packages[@]}")
+   ceilometer_services=(
+      ceilometer-agent-central
+      ceilometer-agent-compute
+      ceilometer-collector
+      ceilometer-agent-notification
+      ceilometer-polling
+      ceilometer-api
+   )
 
    ceilometer_binaries=(
      ceilometer-collector
      ceilometer-agent-notification
      ceilometer-polling
      ceilometer-api
-     ceilometer-alarm-notifier
-     ceilometer-alarm-evaluator
      ceilometer-dbsync
      ceilometer-expirer
      ceilometer-rootwrap
@@ -83,13 +88,9 @@ else
       openstack-ceilometer-notification
       openstack-ceilometer-polling
       openstack-ceilometer-api
-      openstack-ceilometer-alarm-notifier
-      openstack-ceilometer-alarm-evaluator
    )
    ceilometer_binaries=(
      ceilometer-agent-notification
-     ceilometer-alarm-evaluator
-     ceilometer-alarm-notifier
      ceilometer-api
      ceilometer-collector
      ceilometer-dbsync
@@ -349,13 +350,14 @@ case ${package_to_test} in
       fi
 
       # Alarming
-      ceilometer -dv ${ceilometer_auth_string} alarm-threshold-create --name cpu_high --description 'instance running hot' \
- --meter-name cpu_util  --threshold 70.0 --comparison-operator gt  --statistic avg \
- --period 600 --evaluation-periods 3 --alarm-action 'log://' --query resource_id="${resource_id}"
-
-      if [ "$?" -ne '0' -a -z "$(ceilometer ${ceilometer_auth_string} alarm-list | grep cpu_high)" ]; then
-         exit_on_error 1 "Alarm creation has failed"
-      fi
+# Moved to Aodh
+#      ceilometer -dv ${ceilometer_auth_string} alarm-threshold-create --name cpu_high --description 'instance running hot' \
+# --meter-name cpu_util  --threshold 70.0 --comparison-operator gt  --statistic avg \
+# --period 600 --evaluation-periods 3 --alarm-action 'log://' --query resource_id="${resource_id}"
+
+#      if [ "$?" -ne '0' -a -z "$(ceilometer ${ceilometer_auth_string} alarm-list | grep cpu_high)" ]; then
+#         exit_on_error 1 "Alarm creation has failed"
+#      fi
 
       # Samples
       ceilometer -dv ${ceilometer_auth_string} sample-create -m fake_sample --meter-type gauge --meter-unit '%' --sample-volume 100 -r "fake"

diff --git a/trusty/debian/ceilometer-alarm-evaluator.init.in b/trusty/debian/ceilometer-alarm-evaluator.init.in
deleted file mode 100644 (file)
index b73edc1..0000000
--- a/trusty/debian/ceilometer-alarm-evaluator.init.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          ceilometer-alarm-evaluator
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Should-Start:      mongodb rabbitmq-server
-# Should-Stop:       mongodb rabbitmq-server
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: ceilometer alarm evaluator
-# Description:       ceilometer alarm evaluator
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.org>
-DESC="OpenStack Ceilometer Alarm Evaluator"
-PROJECT_NAME=ceilometer
-NAME=${PROJECT_NAME}-alarm-evaluator

diff --git a/trusty/debian/ceilometer-alarm-evaluator.install b/trusty/debian/ceilometer-alarm-evaluator.install
deleted file mode 100644 (file)
index 22eb49f..0000000
--- a/trusty/debian/ceilometer-alarm-evaluator.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/ceilometer-alarm-evaluator

diff --git a/trusty/debian/ceilometer-alarm-evaluator.postrm b/trusty/debian/ceilometer-alarm-evaluator.postrm
deleted file mode 100644 (file)
index 99105ef..0000000
--- a/trusty/debian/ceilometer-alarm-evaluator.postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "${1}" = purge ] ; then
-       rm -f /var/log/ceilometer/ceilometer-alarm-evaluator.log*
-       [ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer
-fi
-
-#DEBHELPER#

diff --git a/trusty/debian/ceilometer-alarm-notifier.init.in b/trusty/debian/ceilometer-alarm-notifier.init.in
deleted file mode 100644 (file)
index f7f4379..0000000
--- a/trusty/debian/ceilometer-alarm-notifier.init.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          ceilometer-alarm-notifier
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Should-Start:      mongodb rabbitmq-server
-# Should-Stop:       mongodb rabbitmq-server
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: ceilometer alarm notifier
-# Description:       ceilometer alarm notifier
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.org>
-DESC="OpenStack Ceilometer Alarm Notifier"
-PROJECT_NAME=ceilometer
-NAME=${PROJECT_NAME}-alarm-notifier

diff --git a/trusty/debian/ceilometer-alarm-notifier.install b/trusty/debian/ceilometer-alarm-notifier.install
deleted file mode 100644 (file)
index c0abb6a..0000000
--- a/trusty/debian/ceilometer-alarm-notifier.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/ceilometer-alarm-notifier

diff --git a/trusty/debian/ceilometer-alarm-notifier.postrm b/trusty/debian/ceilometer-alarm-notifier.postrm
deleted file mode 100644 (file)
index e13d5c4..0000000
--- a/trusty/debian/ceilometer-alarm-notifier.postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "${1}" = purge ] ; then
-       rm -f /var/log/ceilometer/ceilometer-alarm-notifier.log*
-       [ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer
-fi
-
-#DEBHELPER#

diff --git a/trusty/debian/ceilometer-common.install b/trusty/debian/ceilometer-common.install
index a61258052ecf3085710756dcd97b3de39f60b4f4..9e601aa0e37dd5a5a3a7c9daea5aff6c936dfaf4 100644 (file)
--- a/trusty/debian/ceilometer-common.install
+++ b/trusty/debian/ceilometer-common.install
@@ -4,10 +4,9 @@
 /usr/bin/ceilometer-rootwrap
 /usr/bin/ceilometer-send-sample
 etc/ceilometer/api_paste.ini                   /etc/ceilometer
+etc/ceilometer/ceilometer-config-generator.conf /etc/ceilometer
 etc/ceilometer/event_definitions.yaml          /etc/ceilometer
 etc/ceilometer/event_pipeline.yaml             /etc/ceilometer
-etc/ceilometer/gabbi_pipeline.yaml             /etc/ceilometer
-etc/ceilometer/gnocchi_archive_policy_map.yaml /etc/ceilometer
 etc/ceilometer/gnocchi_resources.yaml          /etc/ceilometer
 etc/ceilometer/pipeline.yaml                   /etc/ceilometer
 etc/ceilometer/policy.json                     /etc/ceilometer

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index fdae7627f006c85c2dbec3e690377b11447dd19e..b098fdc236e1f0a74b9514191266a725127f5002 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,33 @@
+ceilometer (1:6.0.0~b2-1~u14.04+mos1) mos9.0; urgency=medium
+
+  * Synchronize build scripts from Debian.
+    Source: https://anonscm.debian.org/git/openstack/ceilometer.git
+    Commit: c7caa6f0ab1349e09745c17c600eb6b5d7532e4f
+
+ -- Daniil Trishkin <dtrishkin@mirantis.com>  Thu, 04 Feb 2016 13:13:43 +0000
+
+ceilometer (1:6.0.0~b2-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * The alarm packages are now transition packages to Aodh.
+  * Fixed debian/copyright ordering.
+  * Updated namespaces when generating the config file.
+
+ -- Thomas Goirand <zigo@debian.org>  Tue, 08 Dec 2015 11:53:07 +0100
+
+ceilometer (1:6.0.0~b1-1~u14.04+mos1) mos9.0; urgency=medium
+
+  * Update runtime requirements according to global requirements of Mitaka
+  * Update build depends according to test requirements of the project
+  * d/ceilometer-common.install: 
+    - Remove gabbi_pipeline.yaml
+      because it's only for tests
+    - Remove gnocchi_archive_policy_map.yaml
+    - Add ceilometer-config-generator.conf
+
+ -- Daniil Trishkin <dtrishkin@mirantis.com>  Wed, 20 Jan 2016 17:37:43 +0000
+
 ceilometer (1:5.0.0-5~u14.04+mos1) mos8.0; urgency=medium
 
   * d/ceilometer-agent-*.init.in: Fix DAEMON_ARGS for

diff --git a/trusty/debian/control b/trusty/debian/control
index 4fbaae23cf33b4680512524f206561d4cccd6c5a..74daafed46edfedc31b38be266fc3ff9099f76e7 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -11,27 +11,29 @@ Build-Depends: debhelper (>= 9),
                python-all,
                python-pbr (>= 1.8),
                python-setuptools,
-               python-sphinx,
+               python-sphinx (>= 1.1.2),
 Build-Depends-Indep: mongodb,
                      python-awsauth,
-                     python-babel,
-                     python-ceilometerclient (>= 1.5.0),
-                     python-contextlib2,
-                     python-coverage,
+                     python-babel (>= 1.3),
+                     python-ceilometerclient (>= 2.2.1),
+                     python-contextlib2 (>= 0.4.0),
+                     python-coverage (>= 3.6),
                      python-croniter,
+                     python-dateutil (>= 2.4.2),
                      python-elasticsearch (>= 1.3.0),
-                     python-eventlet (>= 0.17.4),
                      python-fixtures (>= 1.3.1),
-                     python-gabbi (>= 1.1.4),
-                     python-glanceclient (>= 1:0.18.0),
-                     python-hacking (>= 0.9.2),
-                     python-happybase,
-                     python-httplib2,
-                     python-jsonpath-rw-ext,
+                     python-gabbi (>= 1.11.0),
+                     python-glanceclient (>= 1:1.2.0),
+                     python-gnocchiclient (>= 2.1.0),
+                     python-hacking (>= 0.10.0),
+                     python-happybase (>= 0.5),
+                     python-httplib2 (>= 0.7.5),
+                     python-jsonpath-rw-ext (>= 0.1.9),
                      python-jsonschema,
                      python-kafka,
+                     python-keystoneauth1 (>= 2.1.0),
                      python-keystoneclient (>= 1:1.6.0),
-                     python-keystonemiddleware (>= 2.0.0),
+                     python-keystonemiddleware (>= 4.0.0),
                      python-kombu,
                      python-lxml,
                      python-migrate (>= 0.9.6),
@@ -39,11 +41,12 @@ Build-Depends-Indep: mongodb,
                      python-msgpack (>= 0.4.0),
                      python-mysqldb,
                      python-neutronclient (>= 1:2.6.0),
-                     python-novaclient (>= 2:2.28.1),
+                     python-novaclient (>= 2:2.29.0),
+                     python-oslo.cache (>= 0.8.0),
                      python-oslo.concurrency (>= 2.3.0),
-                     python-oslo.config (>= 1:2.3.0),
+                     python-oslo.config (>= 1:3.2.0),
                      python-oslo.context (>= 0.2.0),
-                     python-oslo.db (>= 2.4.1),
+                     python-oslo.db (>= 4.1.0),
                      python-oslo.i18n (>= 1.5.0),
                      python-oslo.log (>= 1.8.0),
                      python-oslo.messaging (>= 1.16.0),
@@ -51,9 +54,9 @@ Build-Depends-Indep: mongodb,
                      python-oslo.policy (>= 0.5.0),
                      python-oslo.reports (>= 0.1.0),
                      python-oslo.rootwrap (>= 2.0.0),
-                     python-oslo.serialization (>= 1.4.0),
-                     python-oslo.service (>= 0.8.0),
-                     python-oslo.utils (>= 2.0.0),
+                     python-oslo.serialization (>= 2.0.0),
+                     python-oslo.service (>= 1.0.0),
+                     python-oslo.utils (>= 3.4.0),
                      python-oslo.vmware (>= 1.16.0),
                      python-oslosphinx (>= 2.5.0),
                      python-oslotest (>= 1.10.0),
@@ -61,25 +64,25 @@ Build-Depends-Indep: mongodb,
                      python-pecan (>= 1.0.0),
                      python-psycopg2 (>= 2.5),
                      python-pymongo (>= 3.0.2),
-                     python-pymysql,
+                     python-pymysql (>= 0.6.2),
                      python-pysnmp4,
-                     python-requests (>= 2.5.2),
+                     python-requests (>= 2.8.1),
                      python-retrying,
                      python-six (>= 1.9.0),
-                     python-sphinxcontrib.docbookrestapi,
                      python-sphinxcontrib.httpdomain,
-                     python-sphinxcontrib-pecanwsme,
-                     python-sqlalchemy (>= 0.9.9),
+                     python-sphinxcontrib-pecanwsme (>= 0.8),
+                     python-sqlalchemy (>= 1.0.10),
                      python-stevedore (>= 1.5.0),
                      python-swiftclient (>= 1:2.2.0),
-                     python-tempest-lib (>= 0.8.0),
-                     python-testscenarios,
+                     python-tempest-lib (>= 0.13.0),
+                     python-testscenarios (>= 0.4),
                      python-testtools (>= 1.4.0),
-                     python-tooz (>= 1.19.0),
+                     python-tooz (>= 1.28.0),
                      python-tz,
                      python-webob,
+                     python-webtest (>= 2.0),
                      python-werkzeug,
-                     python-wsme (>= 0.7),
+                     python-wsme (>= 0.8),
                      python-yaml,
                      subunit,
                      testrepository,
@@ -92,56 +95,57 @@ Package: python-ceilometer
 Section: python
 Architecture: all
 Depends: libjs-jquery,
-         python-ceilometerclient (>= 1.5.0),
-         python-croniter,
+         python-ceilometerclient (>= 2.2.1),
+         python-dateutil (>= 2.4.2),
          python-eventlet (>= 0.17.4),
-         python-glanceclient (>= 1:0.18.0),
-         python-greenlet,
-         python-happybase,
-         python-jsonpath-rw-ext,
-         python-jsonschema,
-         python-kafka,
+         python-glanceclient (>= 1:1.2.0),
+         python-greenlet (>= 0.3.2),
+         python-happybase (>= 0.5),
+         python-jsonpath-rw-ext (>= 0.1.9),
+         python-jsonschema (>= 2.0.0),
+         python-kafka (>= 0.9.2),
+         python-keystoneauth1 (>= 2.1.0),
          python-keystoneclient (>= 1:1.6.0),
-         python-keystonemiddleware (>= 2.0.0),
-         python-kombu,
-         python-lxml,
+         python-keystonemiddleware (>= 4.0.0),
+         python-kombu (>= 3.0.7),
+         python-lxml (>= 2.3),
          python-migrate (>= 0.9.7),
          python-msgpack (>= 0.4.0),
          python-mysqldb,
          python-neutronclient (>= 1:2.6.0),
-         python-novaclient (>= 2:2.28.1),
+         python-novaclient (>= 2:2.29.0),
          python-oslo.concurrency (>= 2.3.0),
-         python-oslo.config (>= 1:2.3.0),
+         python-oslo.config (>= 1:3.4.0),
          python-oslo.context (>= 0.2.0),
-         python-oslo.db (>= 2.4.1),
-         python-oslo.i18n (>= 1.5.0),
-         python-oslo.log (>= 1.8.0),
-         python-oslo.messaging (>= 1.16.0),
-         python-oslo.middleware (>= 2.8.0),
+         python-oslo.db (>= 4.1.0),
+         python-oslo.i18n (>= 2.1.0),
+         python-oslo.log (>= 1.14.0),
+         python-oslo.messaging (>= 4.0.0),
+         python-oslo.middleware (>= 3.0.0),
          python-oslo.policy (>= 0.5.0),
-         python-oslo.reports (>= 0.1.0),
+         python-oslo.reports (>= 1.0.0),
          python-oslo.rootwrap (>= 2.0.0),
-         python-oslo.serialization (>= 1.4.0),
-         python-oslo.service (>= 0.8.0),
-         python-oslo.utils (>= 2.0.0),
+         python-oslo.serialization (>= 2.0.0),
+         python-oslo.service (>= 1.0.0),
+         python-oslo.utils (>= 3.4.0),
          python-oslo.vmware (>= 1.16.0),
-         python-pastedeploy,
+         python-pastedeploy (>= 1.5.0),
          python-pbr (>= 1.8),
          python-pecan (>= 1.0.0),
-         python-pymongo,
-         python-pymysql,
-         python-pysnmp4,
-         python-requests (>= 2.5.2),
-         python-retrying,
+         python-pymongo (>= 3.0.2),
+         python-pymysql (>= 0.6.2),
+         python-pysnmp4 (>= 4.2.3),
+         python-requests (>= 2.8.1),
+         python-retrying (>= 1.2.3),
          python-six (>= 1.9.0),
-         python-sqlalchemy (>= 0.9.9),
+         python-sqlalchemy (>= 1.0.10),
          python-stevedore (>= 1.5.0),
          python-swiftclient (>= 1:2.2.0),
-         python-tooz (>= 1.19.0),
-         python-tz,
-         python-webob,
-         python-werkzeug,
-         python-wsme (>= 0.7),
+         python-tooz (>= 1.28.0),
+         python-tz (>= 2013.6),
+         python-webob (>= 1.2.3),
+         python-werkzeug (>= 0.7),
+         python-wsme (>= 0.8),
          python-yaml,
          ${misc:Depends},
          ${python:Depends},
@@ -221,12 +225,11 @@ Architecture: all
 Depends: adduser,
          ceilometer-common (= ${binary:Version}),
          debconf,
-         python-openstackclient,
+         python-openstackclient (>= 2.0.0),
          ${misc:Depends},
          ${ostack-lsb-base},
          ${python:Depends},
-Recommends: q-text-as-data,
-Suggests: mongodb,
+Suggests: mongodb, q-text-as-data
 Description: OpenStack efficient metering counters system (API service)
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
  providing all the counters they need to establish customer billing, across
@@ -314,11 +317,9 @@ Description: OpenStack efficient metering counters system - notification agent
 
 Package: ceilometer-alarm-evaluator
 Architecture: all
-Depends: ceilometer-common (= ${binary:Version}),
+Depends: aodh-evaluator,
          ${misc:Depends},
-         ${ostack-lsb-base},
-         ${python:Depends},
-Description: OpenStack efficient metering counters system - alarm evaluator
+Description: OpenStack efficient metering counters system - aodh-evaluator trans
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
  providing all the counters they need to establish customer billing, across
  all current and future OpenStack components. The delivery of counters must be
@@ -326,17 +327,14 @@ Description: OpenStack efficient metering counters system - alarm evaluator
  projects, and agents doing data collections should be independent of the
  overall system.
  .
- (A ceilometer is an instrument that measures cloud coverage.)
- .
- This package contains the alarm evaluator daemon.
+ This package is a dummy transition package to aodh-evaluator and can be safely
+ removed.
 
 Package: ceilometer-alarm-notifier
 Architecture: all
-Depends: ceilometer-common (= ${binary:Version}),
+Depends: aodh-notifier,
          ${misc:Depends},
-         ${ostack-lsb-base},
-         ${python:Depends},
-Description: OpenStack efficient metering counters system - alarm notifier
+Description: OpenStack efficient metering counters system - aodh-notifier trans
  Ceilometer aims to deliver a Single Point Of Contact for billing systems,
  providing all the counters they need to establish customer billing, across
  all current and future OpenStack components. The delivery of counters must be
@@ -344,9 +342,8 @@ Description: OpenStack efficient metering counters system - alarm notifier
  projects, and agents doing data collections should be independent of the
  overall system.
  .
- (A ceilometer is an instrument that measures cloud coverage.)
- .
- This package contains the alarm notifier daemon.
+ This package is a dummy transition package to aodh-notifier and can be safely
+ removed.
 
 Package: ceilometer-doc
 Section: doc

diff --git a/trusty/debian/copyright b/trusty/debian/copyright
index 3502f1953f475c8f8bb271cfd689dd1444cab0cd..eae8f562ca8383317cab7498d0af432dba7215cb 100644 (file)
--- a/trusty/debian/copyright
+++ b/trusty/debian/copyright
@@ -2,11 +2,6 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ceilometer
 Source: https://github.com/stackforge/ceilometer
 
-Files: debian/*
-Copyright: 2012-2015, Canonical Ltd
-           2012-2015, Thomas Goirand <zigo@debian.org>
-License: Apache-2.0
-
 Files: *
 Copyright: 2012 New Dream Network, LLC (DreamHost)
            2012 eNovance
@@ -18,6 +13,11 @@ Copyright: 2012 New Dream Network, LLC (DreamHost)
            2012-2015, OpenStack Foundation
 License: Apache-2.0
 
+Files: debian/*
+Copyright: 2012-2015, Canonical Ltd
+           2012-2016, Thomas Goirand <zigo@debian.org>
+License: Apache-2.0
+
 License: Apache-2.0
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.

diff --git a/trusty/debian/gbp.conf b/trusty/debian/gbp.conf
index e804d476fcc4a494c45275961b5672fa376318c6..6fb07d66f1cdee92bddf6fd7edddd4bae9c76bed 100644 (file)
--- a/trusty/debian/gbp.conf
+++ b/trusty/debian/gbp.conf
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = master
-debian-branch = debian/liberty
+debian-branch = debian/mitaka
 upstream-tag = %(version)s
 compression = xz
 

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 7b6e2dfa21be50475fc4dfdc33d892ecc0fc7e6e..3cf682c01ee2a490888754e4f4e25526ad89bb63 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -13,16 +13,24 @@ override_dh_clean:
        rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
 
 override_dh_install:
+       rm -rf $(CURDIR)/debian/tmp
+       python2.7 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp
        dh_install --fail-missing
 
        # Manage ceilometer.conf
        mkdir -p $(CURDIR)/debian/ceilometer-common/etc/ceilometer
        mkdir -p $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
-       oslo-config-generator --output-file $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf \
+       PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
+               --output-file $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf \
+               --wrap-width 140 \
                --namespace ceilometer \
+               --namespace oslo.concurrency \
                --namespace oslo.db \
+               --namespace oslo.log \
                --namespace oslo.messaging \
+               --namespace oslo.middleware.cors \
                --namespace oslo.policy \
+               --namespace oslo.service.service \
                --namespace keystonemiddleware.auth_token
        #sed -i 's|[# \t]*auth_protocol[\t ]*=.*|auth_protocol=http|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
        chmod 0644 $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf