Updated heat.conf generation --namespace params.

Rewritten-From: 37b5f97bcd07baf91bb1e747ca0c4108a5ab9210

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index d6ff938da0e5af67940ec0f3391b90b8f114e0b3..42504be7cfec7b90a160e87d5060c482f53d92d6 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -5,6 +5,7 @@ heat (1:6.0.0~b2-1) experimental; urgency=medium
   * Removed the patch for allowing routes 2.0.
   * Also package new /usr/bin/heat-wsgi-api{,-cloudwatch,-cfn}
   * Fixed debian/copyright ordering.
+  * Updated heat.conf generation --namespace params.
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 08 Dec 2015 14:16:00 +0100
 

diff --git a/trusty/debian/rules b/trusty/debian/rules
index a9ed71c02ef59f6f32dc529e4a7045363084fa8e..5f449d074eb8139b6e2224099a527bfa019cf260 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -36,22 +36,25 @@ override_dh_install:
        mkdir -p $(CURDIR)/debian/heat-common/usr/share/heat-common
        oslo-config-generator \
                --namespace heat.common.config \
+                --namespace heat.common.context \
                --namespace heat.common.crypt \
                --namespace heat.common.heat_keystoneclient \
                --namespace heat.common.wsgi \
                --namespace heat.engine.clients \
                --namespace heat.engine.notification \
                --namespace heat.engine.resources \
-               --namespace heat.openstack.common.eventlet_backdoor \
-               --namespace heat.openstack.common.log \
-               --namespace heat.openstack.common.policy \
-               --namespace heat.api.middleware.ssl \
+                --namespace heat.api.middleware.ssl \
                --namespace heat.api.aws.ec2token \
                --namespace keystonemiddleware.auth_token \
                --namespace oslo.messaging \
+                --namespace oslo.middleware \
                --namespace oslo.db \
                --namespace oslo.log \
-               --wrap-width 120 \
+                --namespace oslo.policy \
+                --namespace oslo.service.service \
+                --namespace oslo.service.periodic_task \
+                --namespace oslo.service.sslutil \
+               --wrap-width 140 \
                --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