From: Thomas Goirand <zigo@debian.org>
Date: Wed, 10 Jun 2015 08:56:44 +0000 (+0200)
Subject: Fixed config file generation taking patches from upstream.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=53718d89d7fc8b8bf4b5f592fb8abed1d3b6c0b4;p=openstack-build%2Fcinder-build.git

Fixed config file generation taking patches from upstream.
---

diff --git a/debian/changelog b/debian/changelog
index a34e46798..436b40a9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cinder (2015.1.0-2) UNRELEASED; urgency=medium
 
   * Fixed debian/watch file to read from correct cinder project and not Nova.
+  * Fixed config file generation taking patches from upstream.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 11 May 2015 23:07:24 +0200
 
diff --git a/debian/rules b/debian/rules
index 93276a581..733c176f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,10 @@ override_dh_install:
 	oslo-config-generator --output-file $(CURDIR)/etc/cinder/cinder.conf.sample \
 		--wrap-width 140 \
 		--namespace cinder \
-		--namespace oslo.concurrency \
-		--namespace oslo.db \
-		--namespace oslo.messaging \
-		--namespace oslo.policy \
+		--namespace oslo_concurrency \
+		--namespace oslo_db \
+		--namespace oslo_messaging \
+		--namespace cinder.policy \
 		--namespace keystonemiddleware.auth_token \
 		--namespace cinder.openstack.common.eventlet_backdoor \
 		--namespace cinder.openstack.common.log \