Fixed cinder.conf generation.

diff --git a/debian/changelog b/debian/changelog
index ba9a1ce7fa5f99f1d31a7b6cb4653ad2ef0fde36..a3788b57c54a744bb89258ab0a57f6e2bc9bf314 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 cinder (2:7.0.0~rc1-2) UNRELEASED; urgency=medium
 
   * cinder-api depends on python-openstackclient.
+  * Fixed cinder.conf generation.
 
- -- Thomas Goirand <zigo@debian.org>  Fri, 25 Sep 2015 11:24:06 +0000
+ -- Thomas Goirand <zigo@debian.org>  Tue, 29 Sep 2015 13:23:42 +0000
 
 cinder (2:7.0.0~rc1-1) experimental; urgency=medium
 

diff --git a/debian/rules b/debian/rules
index 2274bccda5d5d8dd50aa6dba715b45a050af4e19..0e5bfd01d9ddd6385d9e5abb78b692c18c5646cf 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,23 +31,30 @@ override_dh_install:
        dh_install --fail-missing -Xbin/cinder-all
        install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common
 
-       oslo-config-generator --output-file $(CURDIR)/etc/cinder/cinder.conf.sample \
+       mkdir -p $(CURDIR)/debian/cinder-common/usr/share/cinder-common
+       PYTHONPATH=. oslo-config-generator --output-file $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf \
                --wrap-width 140 \
                --namespace cinder \
-               --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 \
-               --namespace cinder.openstack.common.periodic_task \
-               --namespace cinder.openstack.common.policy \
-               --namespace oslo_db.concurrency
-       install -D -m 0644 $(CURDIR)/etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+               --namespace oslo.config \
+               --namespace oslo.concurrency \
+               --namespace oslo.context \
+               --namespace oslo.db \
+               --namesapce oslo.i18n \
+               --namespace oslo.log \
+               --namespace oslo.messaging \
+               --namespace oslo.middleware \
+               --namespace oslo.policy \
+               --namespace oslo.reports \
+               --namespace oslo.rootwrap \
+               --namespace oslo.serialization \
+               --namespace oslo.service \
+               --namespace oslo.utils \
+               --namespace oslo.versionedobjects \
+               --namespace oslo.vmware
 
        # Disable https in default setup, as this makes our CI fail
-       sed -i 's/#auth_protocol=https/auth_protocol=http/' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+       sed -i 's/^[ \t#]*auth_protocol[ \t]*=[ \t].*/auth_protocol = http/' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
 
        # Default to keystone auth
        sed -i "s/#auth_strategy=noauth/auth_strategy=keystone/" $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf