Using SQLite as default db connection.

Rewritten-From: f19b0cfbc8b3eefe2e42a75dd882418722cd496b

diff --git a/trusty/debian/patches/allow-routes-2.0.patch b/trusty/debian/patches/allow-routes-2.0.patch
deleted file mode 100644 (file)
index 672e13d..0000000
--- a/trusty/debian/patches/allow-routes-2.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Allow routes 2.0
- The python-routes 2.0 from Debian is perfectly working, the issue with 2.0
- is only the PyPi release, so we patch requirements.txt to allow it.
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-10-02
-
---- heat-2014.2~rc1.orig/requirements.txt
-+++ heat-2014.2~rc1/requirements.txt
-@@ -34,7 +34,7 @@ python-troveclient>=1.0.4
- PyYAML>=3.1.0
- qpid-python
- requests>=1.2.1,!=2.4.0
--Routes>=1.12.3,!=2.0
-+Routes>=1.12.3
- six>=1.7.0
- SQLAlchemy>=0.8.4,<=0.8.99,>=0.9.7,<=0.9.99
- sqlalchemy-migrate>=0.9.1,!=0.9.2

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
deleted file mode 100644 (file)
index 014ce49..0000000
--- a/trusty/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-allow-routes-2.0.patch

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 95664574241defdd0331a6a674528ac514c3a56d..111c032e37adcaa2068274456436cd19c2a45f0d 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -33,7 +33,10 @@ override_dh_clean:
        rm -f debian/*.init debian/*.service debian/*.upstart
 
 override_dh_install:
+       # Generate the configuration sample file
        PYTHONPATH=. bash tools/config/generate_sample.sh -b . -p heat -o etc/heat
+       # Fix the default db connection to use SQLite
+       sed -i 's|^[# \t]*connection[\t #]*=.*|connection=sqlite:////var/lib/heat/heatdb|' etc/heat/heat.conf.sample
 
        dh_install --fail-missing -Xbin/cinder-keystone-setup
        install -D -m 0640 etc/heat/heat.conf.sample $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf