From 608329987e33f60e7031f3c7ccabad1cc1591fc3 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 10 Jun 2015 10:56:44 +0200 Subject: [PATCH] Fixed config file generation taking patches from upstream. Rewritten-From: 53718d89d7fc8b8bf4b5f592fb8abed1d3b6c0b4 --- xenial/debian/changelog | 1 + xenial/debian/rules | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index a34e46798..436b40a9b 100644 --- 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 Mon, 11 May 2015 23:07:24 +0200 diff --git a/xenial/debian/rules b/xenial/debian/rules index 93276a581..733c176f3 100755 --- 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 \ -- 2.45.2