Merge lp:~zulcss/ceilometer/general-brokeness into lp:~openstack-ubuntu-testing/ceilometer/havana

[Chuck Short]

[Yolanda Robla (yolanda.robla)]

looks good to me

review: Approve

=== modified file 'debian/ceilometer-collector.install'
--- debian/ceilometer-collector.install	2012-11-22 18:55:57 +0000
+++ debian/ceilometer-collector.install	2013-05-28 11:39:28 +0000
@@ -1,1 +1,2 @@
 usr/bin/ceilometer-collector
+usr/bin/ceilometer-collector-udp

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-21 14:44:41 +0000
+++ debian/changelog	2013-05-28 11:39:28 +0000
@@ -1,4 +1,4 @@
-ceilometer (2013.2.a151.geaa6b33-0ubuntu1) UNRELEASED; urgency=low
+ceilometer (2013.2.a175.gae9ccbd-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/rules: Add fail-missing if binaries are missing 
@@ -8,9 +8,12 @@
   * debian/control: Add python-fixtures as build-dependencies.
   * debian/control: Add python-nova as build-dependencies.
   * debian/control: Add python-testtools
+  * debian/control: Add msgpack-python.
   * debian/patches/requests-dep.patch: Dropped no longer needed.
   * debian/patches/remove-hbase-support.patch: Dropped no longer neded.
   * debian/patches/default-dbconnection-sqlite.patch: Refreshed.
+  * debian/rules: Use testr instead of nosetests to run tests.
+  * debian/ceilometer-collector.install: Added usr/bin/ceilometer-collector-udp.
 
  -- Chuck Short <[e-mail]>  Tue, 21 May 2013 07:49:01 -0500
 

=== modified file 'debian/control'
--- debian/control	2013-05-21 14:28:17 +0000
+++ debian/control	2013-05-28 11:39:28 +0000
@@ -27,7 +27,6 @@
  python-mox,
  python-netaddr,
  python-netifaces,
- python-nose,
  python-nova,
  python-novaclient (>= 2.6.10),
  python-oslo.config,
@@ -45,7 +44,9 @@
  python-unittest2,
  python-webob (>= 1.2),
  python-wsme (>= 0.5b1),
- python-yaml
+ python-yaml,
+ testrepository,
+ msgpack-python
 Standards-Version: 3.9.4
 
 Package: python-ceilometer

=== modified file 'debian/patches/default-dbconnection-sqlite.patch'
--- debian/patches/default-dbconnection-sqlite.patch	2013-05-21 14:28:17 +0000
+++ debian/patches/default-dbconnection-sqlite.patch	2013-05-28 11:39:28 +0000
@@ -1,11 +1,11 @@
-diff -Naurp ceilometer-2013.2.a151.geaa6b33.orig/etc/ceilometer/ceilometer.conf.sample ceilometer-2013.2.a151.geaa6b33/etc/ceilometer/ceilometer.conf.sample
---- ceilometer-2013.2.a151.geaa6b33.orig/etc/ceilometer/ceilometer.conf.sample	2013-05-21 07:45:54.000000000 -0500
-+++ ceilometer-2013.2.a151.geaa6b33/etc/ceilometer/ceilometer.conf.sample	2013-05-21 08:00:43.786560523 -0500
-@@ -405,6 +405,7 @@
+diff -Naurp ceilometer-2013.2.a175.gae9ccbd.orig/etc/ceilometer/ceilometer.conf.sample ceilometer-2013.2.a175.gae9ccbd/etc/ceilometer/ceilometer.conf.sample
+--- ceilometer-2013.2.a175.gae9ccbd.orig/etc/ceilometer/ceilometer.conf.sample	2013-05-27 20:11:35.000000000 -0500
++++ ceilometer-2013.2.a175.gae9ccbd/etc/ceilometer/ceilometer.conf.sample	2013-05-27 20:16:48.569019601 -0500
+@@ -497,6 +497,7 @@
  
  # Database connection string (string value)
  #database_connection=mongodb://localhost:27017/ceilometer
 +database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
  
  
- ######## defined in ceilometer.storage.sqlalchemy.models ########
+ #

=== modified file 'debian/rules'
--- debian/rules	2013-05-21 14:28:17 +0000
+++ debian/rules	2013-05-28 11:39:28 +0000
@@ -14,7 +14,7 @@
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
 	mkdir -p ${HOME}
-	PYTHONPATH=$(CURDIR) nosetests || true
+	testr init && testr run || true
 endif
 
 override_dh_install: