From: Thomas Goirand Date: Wed, 7 May 2014 07:04:48 +0000 (+0800) Subject: Sets /etc/ceilometer/{policy,sources}.json as conffile and remove handling from the... X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1c45aa907de773ba76969a2115547a33e1e9eb5e;p=openstack-build%2Fceilometer-build.git Sets /etc/ceilometer/{policy,sources}.json as conffile and remove handling from the from maintainer scripts Change-Id: Ibb174cf00b4f18af7de5dcabeb4586bbd3b51c4b Rewritten-From: f0b01690384eb9f7ec7a752625ccc46538dc9a8c --- diff --git a/trusty/debian/ceilometer-common.install b/trusty/debian/ceilometer-common.install index 3fa046a..e48b05a 100644 --- a/trusty/debian/ceilometer-common.install +++ b/trusty/debian/ceilometer-common.install @@ -2,3 +2,5 @@ /usr/bin/ceilometer-expirer tools/show_data.py usr/share/doc/ceilometer etc/ceilometer/pipeline.yaml /etc/ceilometer +etc/ceilometer/policy.json /etc/ceilometer +etc/ceilometer/sources.json /etc/ceilometer diff --git a/trusty/debian/ceilometer-common.postinst.in b/trusty/debian/ceilometer-common.postinst.in index 63ad73f..903cf1c 100644 --- a/trusty/debian/ceilometer-common.postinst.in +++ b/trusty/debian/ceilometer-common.postinst.in @@ -42,8 +42,6 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then adduser ceilometer nova || true adduser ceilometer ${LIBVIRT_GROUP} || true pkgos_write_new_conf ceilometer ceilometer.conf - pkgos_write_new_conf ceilometer policy.json - pkgos_write_new_conf ceilometer sources.json 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 ec814f8..5476688 100644 --- a/trusty/debian/ceilometer-common.postrm +++ b/trusty/debian/ceilometer-common.postrm @@ -4,8 +4,6 @@ set -e if [ "${1}" = "purge" ] ; then rm -f /etc/ceilometer/ceilometer.conf - rm -f /etc/ceilometer/policy.json - rm -f /etc/ceilometer/sources.json 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 62198bf..93bfa6d 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -2,6 +2,7 @@ ceilometer (2014.1-3) unstable; urgency=medium * Sets /etc/ceilometer/pipeline.yaml as conffile and remove handling from the from maintainer scripts (Closes: #747216). + * Did the same for etc/ceilometer/{policy,sources}.json. -- Thomas Goirand Tue, 06 May 2014 23:00:59 +0800 diff --git a/trusty/debian/rules b/trusty/debian/rules index 0347473..e6df3bf 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -18,8 +18,6 @@ override_dh_clean: 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 override_dh_auto_build: dh_auto_build