From c85848ba08db4bafa139740b3170781d177aa1e4 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 23 Dec 2014 16:35:35 +0800
Subject: [PATCH] Now generates cinder.conf on the fly.

Rewritten-From: 1f0e74b243f0f25e8ca2463b889199b2e99abe12
---
 trusty/debian/changelog | 1 +
 trusty/debian/rules     | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 409fa5b3c..2201bbe85 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -2,6 +2,7 @@ cinder (2015.1~b1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Updated (build-)depends for this release.
+  * Now generates cinder.conf on the fly.
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 23 Dec 2014 15:21:52 +0800
 
diff --git a/trusty/debian/rules b/trusty/debian/rules
index 6ab1e5c47..6dbebf0bd 100755
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -18,6 +18,8 @@ override_dh_clean:
 	rm -rf debian/*.upstart debian/*.service
 
 override_dh_install:
+	tools/config/generate_sample.sh -b . -p cinder -o etc/cinder
+
 	dh_install --fail-missing -Xbin/cinder-all
 	install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common
 	install -D -m 0644 $(CURDIR)/etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
-- 
2.45.2