X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=xenial%2Fdebian%2Frules;h=79608a6157635883d82b497b27126e29198c7615;hb=969bbb2ef5d0b554a8f1b3438e266b1251e9bbb3;hp=3a91a367d11446d9323088ba9f1e5862a88fbbb8;hpb=5f1ed626a8c473d5e15990f560a303d9d013493c;p=openstack-build%2Fceilometer-build.git

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 3a91a36..79608a6 100755
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -20,10 +20,14 @@ override_dh_install:
 
 	# Manage ceilometer.conf
 	mkdir -p $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
-	PYTHONPATH=. bash tools/config/generate_sample.sh -b . -p ceilometer -o $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
-	mv $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf.sample $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
+	oslo-config-generator --output-file $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf \
+		--namespace ceilometer \
+		--namespace oslo.db \
+		--namespace oslo.messaging \
+		--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
-	sed -i 's|#connection=|connection=mongodb://localhost:27017/ceilometer|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
+	sed -i 's|#connection[ \t]*=.*|connection=mongodb://localhost:27017/ceilometer|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
 
 override_dh_auto_build:
 	dh_auto_build
@@ -44,7 +48,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	testr init
 	set -e && \
 		TEMP_REZ=`mktemp -t` && \
-		bash -x ./setup-test-env.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit || true ; \
+		bash -x ./setup-test-env-mongodb.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit || true ; \
 		cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats || true ; \
 		rm -f $$TEMP_REZ ;
 	testr slowest