From 2b568c28e78ad5bbb4eef228cb4646965c153af7 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 21 Jan 2016 04:49:58 +0000 Subject: [PATCH] Updated heat.conf generation --namespace params. Rewritten-From: 37b5f97bcd07baf91bb1e747ca0c4108a5ab9210 --- xenial/debian/changelog | 1 + xenial/debian/rules | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index d6ff938d..42504be7 100644 --- a/xenial/debian/changelog +++ b/xenial/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 Tue, 08 Dec 2015 14:16:00 +0100 diff --git a/xenial/debian/rules b/xenial/debian/rules index a9ed71c0..5f449d07 100755 --- a/xenial/debian/rules +++ b/xenial/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 -- 2.45.2