Sets /etc/ceilometer/{policy,sources}.json as conffile and remove handling from the...

Change-Id: Ibb174cf00b4f18af7de5dcabeb4586bbd3b51c4b

Rewritten-From: f0b01690384eb9f7ec7a752625ccc46538dc9a8c

diff --git a/xenial/debian/ceilometer-common.install b/xenial/debian/ceilometer-common.install
index 3fa046afd7fce73f381e5673ac4f828ee8460f3b..e48b05ae6d37bb2aca39dcd800480da067bbc0bb 100644 (file)
--- a/xenial/debian/ceilometer-common.install
+++ b/xenial/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/xenial/debian/ceilometer-common.postinst.in b/xenial/debian/ceilometer-common.postinst.in
index 63ad73fdc44faa699b8b8d8619b2f11385d8b704..903cf1ca648b4eb26d36bf208d155e3107bea144 100644 (file)
--- a/xenial/debian/ceilometer-common.postinst.in
+++ b/xenial/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/xenial/debian/ceilometer-common.postrm b/xenial/debian/ceilometer-common.postrm
index ec814f83fab115c1456f551ae4f2010505b756e9..547668865eecf68e202c7b53d7c706734d74bec0 100644 (file)
--- a/xenial/debian/ceilometer-common.postrm
+++ b/xenial/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/xenial/debian/changelog b/xenial/debian/changelog
index 62198bf0568fe6b969d7558a5d6290fc359b25b6..93bfa6de5530b32bff5cabf1c9925ae66408e5a0 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/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 <zigo@debian.org>  Tue, 06 May 2014 23:00:59 +0800
 

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 0347473d48b2d35c369d1b4ce23a8b130b0766db..e6df3bf7cce68f1d5e0d3d1df84a15f3b8eb01cc 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/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