From 53061c8f3c4636057ace7ee5f63314c5da53b89a Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Tue, 1 Apr 2014 17:45:01 +0100
Subject: [PATCH] Update config to support upgrade with db sync in maintainer
 scripts

---
 templates/grizzly/ceilometer.conf | 3 +++
 templates/havana/ceilometer.conf  | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/templates/grizzly/ceilometer.conf b/templates/grizzly/ceilometer.conf
index 79612e5..4c13af9 100644
--- a/templates/grizzly/ceilometer.conf
+++ b/templates/grizzly/ceilometer.conf
@@ -18,3 +18,6 @@ os_username = {{ admin_user }}
 os_password = {{ admin_password }}
 {% endif -%}
 logdir = /var/log/ceilometer
+# NOTE(jamespage) this allows the db sync process to run OK for upgrades
+# fixed in icehouse
+database_connection=sqlite:////var/lib/ceilometer/ceilometer.sqlite
diff --git a/templates/havana/ceilometer.conf b/templates/havana/ceilometer.conf
index 63f346f..6157f75 100644
--- a/templates/havana/ceilometer.conf
+++ b/templates/havana/ceilometer.conf
@@ -20,3 +20,8 @@ os_password = {{ admin_password }}
 [publisher_rpc]
 metering_secret = {{ metering_secret }}
 {% endif -%}
+[database]
+# NOTE(jamespage) this allows the db sync process to run OK for upgrades
+# fixed in icehouse
+backend=sqlalchemy
+connection=sqlite:////var/lib/ceilometer/$sqlite_db