Generating config file from script, since it's gone from upstream.

Change-Id: Iec09a6e1e4223b3134158e3b7cf8e5931e4e2a68

Rewritten-From: 6704e19cb9346f4214e4e153f5037234ba42e04a

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 6472ffccd23b8f9f18b005544fba57a8e91b0179..003acf9f6eebf832a97edf9eb0db51d38173795c 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,6 +1,7 @@
 ceilometer (2014.2~b1-1) experimental; urgency=medium
 
   * New upstream release.
+  * Generating config file from script, since it's gone from upstream.
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 01 Jul 2014 15:01:05 +0800
 

diff --git a/trusty/debian/rules b/trusty/debian/rules
index e6df3bf7cce68f1d5e0d3d1df84a15f3b8eb01cc..bf169c2e474146dbc35ac1587ef6a9dbcc09acac 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -17,7 +17,9 @@ 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
+       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
+       chmod 0644 $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
 
 override_dh_auto_build:
        dh_auto_build