X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=xenial%2Fdebian%2Frules;h=dda95e1bc986f2470ecdf81157ddddcc1fa9f744;hb=a564118fc4f9c57d04360d6bf0c75207bc8fa85d;hp=7f7a2e41e68e7e1ee0934da349d1a98df4064b65;hpb=efad937e4651a6817d0c29ce95b73e1aedc971b1;p=openstack-build%2Fceilometer-build.git

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 7f7a2e4..dda95e1 100755
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -13,15 +13,23 @@ 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/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
@@ -46,7 +54,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	testr init
 	set -e ; \
 		TEMP_REZ=`mktemp -t` ; \
-		bash -x ./setup-test-env-mongodb.sh testr run --subunit 'tests\.(?!(.*test_bin.*|.*functional.*|.*gabbi\.test_gabbi_prefix.*))' | tee $$TEMP_REZ | subunit2pyunit ; \
+		bash -x ./debian/setup-test-env-mongodb.sh testr run --subunit 'tests\.(?!(.*test_bin.*|.*functional.*|.*gabbi\.test_gabbi_prefix.*|.*meter\.test_notifications\.TestMeterProcessing\.test_fallback_meter_path.*|.*agent\.test_manager\.TestRunTasks\.test_batching_polled_samples_false.*))' | tee $$TEMP_REZ | subunit2pyunit ; \
 		cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
 		rm -f $$TEMP_REZ ;
 	testr slowest