Fixed config file generation taking patches from upstream.

Rewritten-From: 53718d89d7fc8b8bf4b5f592fb8abed1d3b6c0b4

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index a34e467986ce65d4c9b57b279974e3e18e5a0ae7..436b40a9b67146afcb3810753758f1ae668e4e4d 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/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/xenial/debian/rules b/xenial/debian/rules
index 93276a5812397c7a3c30ef7e2b78f829c04574de..733c176f380387d56a7e20b97900591787308134 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/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 \