From ec6d91a720e490e441a6a1ab4b70c6edc58f2dca Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 8 Apr 2014 16:55:54 +0800 Subject: [PATCH] Fixed the connection=sqlite:///var/lib/heat/neutrondb as default in the shipped heat.conf. Rewritten-From: 075762fa4d23821504d1ef102f8b18fd43c6975f --- xenial/debian/changelog | 2 ++ xenial/debian/patches/fix-default-db.patch | 18 ++++++++++++++++++ xenial/debian/patches/series | 1 + 3 files changed, 21 insertions(+) create mode 100644 xenial/debian/patches/fix-default-db.patch diff --git a/xenial/debian/changelog b/xenial/debian/changelog index e661663c..50031b06 100644 --- a/xenial/debian/changelog +++ b/xenial/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 Mon, 07 Apr 2014 00:58:35 +0800 diff --git a/xenial/debian/patches/fix-default-db.patch b/xenial/debian/patches/fix-default-db.patch new file mode 100644 index 00000000..263a2056 --- /dev/null +++ b/xenial/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 +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/xenial/debian/patches/series b/xenial/debian/patches/series index b9b56a85..b42f05ef 100644 --- a/xenial/debian/patches/series +++ b/xenial/debian/patches/series @@ -1 +1,2 @@ sqlalchemy-requirement-fix.patch +fix-default-db.patch -- 2.45.2