X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Frules;h=848ea8bb92771565b56aa5c1dd8488b680bd476a;hb=2d8da049d6891e0216ed1fdc8d7b0c441c3f9f55;hp=b3611c30250b9d67e9d4314eaba43c424705a0fd;hpb=d8c6eacd12a86fa746d254e7bdc2984ac6857b1a;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/rules b/trusty/debian/rules
index b3611c3..848ea8b 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -16,11 +16,12 @@ 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
+	dh_install --fail-missing
 
 	# 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 $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
+	mv $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf.sample $(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