From: Thomas Goirand Date: Tue, 6 May 2014 15:02:15 +0000 (+0800) Subject: Sets /etc/ceilometer/pipeline.yaml as conffile and remove handling from the from... X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7ff80d3ba2a8027e8b654efe0f542984f5b66d48;p=openstack-build%2Fceilometer-build.git Sets /etc/ceilometer/pipeline.yaml as conffile and remove handling from the from maintainer scripts (Closes: #747216). Change-Id: Ie379cdc02b00c6be90231a9d9ce9d7aeaee2d06d Rewritten-From: 1306ae33e55d86cb416960b41887a559e97ee256 --- diff --git a/trusty/debian/ceilometer-common.install b/trusty/debian/ceilometer-common.install index 1301660..3fa046a 100644 --- a/trusty/debian/ceilometer-common.install +++ b/trusty/debian/ceilometer-common.install @@ -1,3 +1,4 @@ /usr/bin/ceilometer-dbsync /usr/bin/ceilometer-expirer tools/show_data.py usr/share/doc/ceilometer +etc/ceilometer/pipeline.yaml /etc/ceilometer diff --git a/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in index a8fb13a..63ad73f 100644 --- a/trusty/debian/ceilometer-common.postinst.in +++ b/trusty/debian/ceilometer-common.postinst.in @@ -44,7 +44,6 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then pkgos_write_new_conf ceilometer ceilometer.conf pkgos_write_new_conf ceilometer policy.json pkgos_write_new_conf ceilometer sources.json - pkgos_write_new_conf ceilometer pipeline.yaml pkgos_rabbit_write_conf /etc/ceilometer/ceilometer.conf DEFAULT ceilometer pkgos_write_admin_creds /etc/ceilometer/ceilometer.conf keystone_authtoken ceilometer ceilometer-dbsync || true diff --git a/trusty/debian/ceilometer-common.postrm b/trusty/debian/ceilometer-common.postrm index 534c9a9..ec814f8 100644 --- a/trusty/debian/ceilometer-common.postrm +++ b/trusty/debian/ceilometer-common.postrm @@ -6,7 +6,6 @@ if [ "${1}" = "purge" ] ; then rm -f /etc/ceilometer/ceilometer.conf rm -f /etc/ceilometer/policy.json rm -f /etc/ceilometer/sources.json - rm -f /etc/ceilometer/pipeline.yaml rmdir --ignore-fail-on-non-empty /etc/ceilometer || true rmdir --ignore-fail-on-non-empty /var/lib/nova/cache || true rmdir --ignore-fail-on-non-empty /var/lib/nova || true diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 69a8e77..62198bf 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,10 @@ +ceilometer (2014.1-3) unstable; urgency=medium + + * Sets /etc/ceilometer/pipeline.yaml as conffile and remove handling from the + from maintainer scripts (Closes: #747216). + + -- Thomas Goirand Tue, 06 May 2014 23:00:59 +0800 + ceilometer (2014.1-2) unstable; urgency=medium * Fixed long description typo (Closes: #745321). diff --git a/trusty/debian/rules b/trusty/debian/rules index d939044..0347473 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -20,7 +20,6 @@ override_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 override_dh_auto_build: dh_auto_build