Fixed the connection=sqlite:///var/lib/heat/neutrondb as default in the shipped heat...

Rewritten-From: 075762fa4d23821504d1ef102f8b18fd43c6975f

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index e661663ca92cafdbd404635a694e3e505d3ace09..50031b0657ebf4d73a8b3fbe50f25e16d14b65f4 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,6 +1,8 @@
 heat (2014.1~rc1-2) experimental; urgency=low
 
   * Fixed dbsync for Icehouse (using heat-manage db_sync now).
+  * Fixed the connection=sqlite:///var/lib/heat/neutrondb as default in the
+    shipped heat.conf.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 07 Apr 2014 00:58:35 +0800
 

diff --git a/trusty/debian/patches/fix-default-db.patch b/trusty/debian/patches/fix-default-db.patch
new file mode 100644 (file)
index 0000000..263a205
--- /dev/null
+++ b/trusty/debian/patches/fix-default-db.patch
@@ -0,0 +1,18 @@
+Description: Sets default DSN
+ The default DSN isn't working for the packaging, so we do that:
+ +connection=sqlite:///var/lib/heat/neutrondb by default.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: not-needed
+Last-Update: 2014-04-08
+
+--- heat-2014.1~rc1.orig/etc/heat/heat.conf.sample
++++ heat-2014.1~rc1/etc/heat/heat.conf.sample
+@@ -814,7 +814,7 @@
+ # Deprecated group/name - [DEFAULT]/sql_connection
+ # Deprecated group/name - [DATABASE]/sql_connection
+ # Deprecated group/name - [sql]/connection
+-#connection=sqlite:////heat/openstack/common/db/$sqlite_db
++connection=sqlite:///var/lib/heat/neutrondb
+ 
+ # The SQLAlchemy connection string used to connect to the
+ # slave database (string value)

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index b9b56a85e6b24dd8174b420220105abc6994d2dc..b42f05ef1abaa53f262551b041c64b817e977c16 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1 +1,2 @@
 sqlalchemy-requirement-fix.patch
+fix-default-db.patch