X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=7de1744dc1b4e7e565ae2c7a0fe661d4ff2895ac;hb=697b52b22d548dd8f1802508300c0859f929bc4f;hp=d7f7d6dcdb554fddbac5abee594388d040411453;hpb=c76062e8e9ed3b90d5b591634b7f5e90fc2bd9ca;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index d7f7d6d..7de1744 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -7,7 +7,7 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 export OSLO_PACKAGE_VERSION=$(VERSION)
 
 %:
-	dh $@  --with python2
+	dh $@  --with python2,systemd
 
 override_dh_clean:
 	dh_clean
@@ -16,11 +16,19 @@ override_dh_clean:
 	rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
 
 override_dh_install:
-	dh_install
-	install -D -m 0644 $(CURDIR)/etc/ceilometer/ceilometer.conf.sample	$(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
-	install -D -m 0644 $(CURDIR)/etc/ceilometer/policy.json			$(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/policy.json
-	install -D -m 0644 $(CURDIR)/etc/ceilometer/sources.json		$(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/sources.json
-	install -D -m 0644 $(CURDIR)/etc/ceilometer/pipeline.yaml		$(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/pipeline.yaml
+	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 \
+		--namespace ceilometer \
+		--namespace oslo.db \
+		--namespace oslo.messaging \
+		--namespace oslo.policy \
+		--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[ \t]*=.*|connection=mongodb://localhost:27017/ceilometer|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
 
 override_dh_auto_build:
 	dh_auto_build
@@ -39,7 +47,10 @@ override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	rm -rf .testrepository
 	testr init
-	bash -x ./setup-test-env.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit || true
-	test slowest
-	testr last --subunit | subunit-filter -s --no-passthrough | subunit-stats
+	set -e ; \
+		TEMP_REZ=`mktemp -t` ; \
+		bash -x ./setup-test-env-mongodb.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit ; \
+		cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
+		rm -f $$TEMP_REZ ;
+	testr slowest
 endif