Added missing oslo.log namespace when generating default config.

Rewritten-From: 1c367bfacf553c7bc73f84a97de6184edddc93d1

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 449c690d7e5b9b0b21f8f7323cb422ccd2756c43..849ab29a02a2d65bf31ef1d0071e2ea6752b5af7 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+heat (2015.1.0-2) unstable; urgency=medium
+
+  * Added missing oslo.log namespace when generating default config.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 15 May 2015 16:27:46 +0200
+
 heat (2015.1.0-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/trusty/debian/rules b/trusty/debian/rules
index e37deeea477f3249b7b01ac2eb37ff22f9389623..492c9c2aa86a688cef4d9369f81f6c185dded57c 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -50,9 +50,12 @@ override_dh_install:
                --namespace keystonemiddleware.auth_token \
                --namespace oslo.messaging \
                --namespace oslo.db \
+               --namespace oslo.log \
                --wrap-width 120 \
                --output-file $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf
        sed -i 's|^[# \t]*connection[\t #]*=.*|connection=sqlite:////var/lib/heat/heatdb|' $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf
+       sed -i 's|^[# \t]*auth_protocol[\t #]*=.*|auth_protocol = http|' $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf
+
 
        dh_install --fail-missing -Xbin/cinder-keystone-setup
        set -e && for pyvers in $(PYTHONS); do \