Fixed new location of the connection directive in config file.

Rewritten-From: a0dc030bbfa3fd6ed1bf1ca314a971635732d1aa

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index bc1f5c0cc14987122d1a99e3c589e5d013f06ac5..6dda81a0d9e6a785983d82fbe99d9f4982fc596a 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/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/xenial/debian/heat-common.config.in b/xenial/debian/heat-common.config.in
index ea17d6de95b29b019d6637970580b18acbc6ba09..2dbe8dc66257837c615a15518ca4c20b63462b94 100644 (file)
--- a/xenial/debian/heat-common.config.in
+++ b/xenial/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/xenial/debian/heat-common.postinst.in b/xenial/debian/heat-common.postinst.in
index e2e9539f2a43d8c4031de9a8389dd39c37541659..da8bd7652392955fef3697eb95c93afd64c6ffc3 100644 (file)
--- a/xenial/debian/heat-common.postinst.in
+++ b/xenial/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'