From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 15 Apr 2014 07:45:41 +0000 (+0800)
Subject: Fixed new location of the connection directive in config file.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=34bcaa0a4c636c6ba26f5d67925294e4b8df8676;p=openstack-build%2Fheat-build.git

Fixed new location of the connection directive in config file.

Rewritten-From: a0dc030bbfa3fd6ed1bf1ca314a971635732d1aa
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index bc1f5c0c..6dda81a0 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -5,6 +5,7 @@ heat (2014.1~rc2-1) experimental; urgency=low
     shipped heat.conf.
   * Fixed (build-)depends for this upstream version.
   * Removed now useless requirements.txt patch.
+  * Fixed new location of the connection directive in config file.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 07 Apr 2014 00:58:35 +0800
 
diff --git a/trusty/debian/heat-common.config.in b/trusty/debian/heat-common.config.in
index ea17d6de..2dbe8dc6 100644
--- a/trusty/debian/heat-common.config.in
+++ b/trusty/debian/heat-common.config.in
@@ -9,7 +9,7 @@ CONF=/etc/heat/heat.conf
 #PKGOS-INCLUDE#
 
 pkgos_var_user_group heat
-pkgos_dbc_read_conf -pkg heat-common ${CONF} DEFAULT sql_connection heat $@
+pkgos_dbc_read_conf -pkg heat-common ${CONF} database connection heat $@
 pkgos_rabbit_read_conf ${CONF} DEFAULT heat
 pkgos_read_admin_creds ${CONF} keystone_authtoken heat
 pkgos_register_endpoint_config heat
diff --git a/trusty/debian/heat-common.postinst.in b/trusty/debian/heat-common.postinst.in
index e2e9539f..da8bd765 100644
--- a/trusty/debian/heat-common.postinst.in
+++ b/trusty/debian/heat-common.postinst.in
@@ -19,7 +19,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
 	chown heat:heat /var/lib/heat /etc/heat
         pkgos_write_new_conf heat heat.conf
 
-	pkgos_dbc_postinst ${CONF} DEFAULT sql_connection heat $@
+	pkgos_dbc_postinst ${CONF} database connection heat $@
 	pkgos_rabbit_write_conf ${CONF} DEFAULT heat
         pkgos_write_admin_creds ${CONF} keystone_authtoken heat
 	pkgos_register_endpoint_postinst heat heat orchestration "Heat Orchestration API" 8004 /v1/'%(tenant_id)s'