X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=xenial%2Fdebian%2Frules;h=b17160a3d2495829bb3d585ca39c399c754c0bba;hb=b7ba3250cedf69a6f35c3a4411bf304a966fa0c7;hp=e6df3bf7cce68f1d5e0d3d1df84a15f3b8eb01cc;hpb=176e5c6d958ebbd469190e282b9bce6d193f4dd0;p=openstack-build%2Fceilometer-build.git

diff --git a/xenial/debian/rules b/xenial/debian/rules
index e6df3bf..b17160a 100755
--- a/xenial/debian/rules
+++ b/xenial/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,8 +16,18 @@ 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
+	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 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
 
 override_dh_auto_build:
 	dh_auto_build
@@ -38,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