Sets /etc/ceilometer/pipeline.yaml as conffile and remove handling from the from...

Change-Id: Ie379cdc02b00c6be90231a9d9ce9d7aeaee2d06d

Rewritten-From: 1306ae33e55d86cb416960b41887a559e97ee256

diff --git a/xenial/debian/ceilometer-common.install b/xenial/debian/ceilometer-common.install
index 13016602996c343f252cb8d8acdbb71beee565a4..3fa046afd7fce73f381e5673ac4f828ee8460f3b 100644 (file)
--- a/xenial/debian/ceilometer-common.install
+++ b/xenial/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/xenial/debian/ceilometer-common.postinst.in b/xenial/debian/ceilometer-common.postinst.in
index a8fb13a1c398d672dd17d6389a631fce2396789c..63ad73fdc44faa699b8b8d8619b2f11385d8b704 100644 (file)
--- a/xenial/debian/ceilometer-common.postinst.in
+++ b/xenial/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/xenial/debian/ceilometer-common.postrm b/xenial/debian/ceilometer-common.postrm
index 534c9a95c37f30d965d67ee90e6c542cc4a73e67..ec814f83fab115c1456f551ae4f2010505b756e9 100644 (file)
--- a/xenial/debian/ceilometer-common.postrm
+++ b/xenial/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/xenial/debian/changelog b/xenial/debian/changelog
index 69a8e77de1fc1eb7ce2e435a4d5eb91d0f86e839..62198bf0568fe6b969d7558a5d6290fc359b25b6 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/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 <zigo@debian.org>  Tue, 06 May 2014 23:00:59 +0800
+
 ceilometer (2014.1-2) unstable; urgency=medium
 
   * Fixed long description typo (Closes: #745321).

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