From 846a75bee578f2118a861384388fbeaf54bcc763 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Mon, 10 Oct 2016 08:45:03 +0000
Subject: [PATCH] Remove sqlite db connection from mitaka template

The ceilometer-agent incorrectly declares a sqlite db connection.
It was required for icehouse, but can be dropped in the mitaka
template.

Change-Id: I7882daacf66eb4efc4810903199fe7082ee86a03
Closes-Bug: 1631876
---
 hooks/update-status              | 1 +
 templates/mitaka/ceilometer.conf | 6 ------
 tests/basic_deployment.py        | 4 ----
 3 files changed, 1 insertion(+), 10 deletions(-)
 create mode 120000 hooks/update-status

diff --git a/hooks/update-status b/hooks/update-status
new file mode 120000
index 0000000..c948469
--- /dev/null
+++ b/hooks/update-status
@@ -0,0 +1 @@
+ceilometer_hooks.py
\ No newline at end of file
diff --git a/templates/mitaka/ceilometer.conf b/templates/mitaka/ceilometer.conf
index d162c62..cef2a90 100644
--- a/templates/mitaka/ceilometer.conf
+++ b/templates/mitaka/ceilometer.conf
@@ -32,9 +32,3 @@ telemetry_secret = {{ metering_secret }}
 {% include "section-keystone-authtoken-mitaka" %}
 
 {% include "section-rabbitmq-oslo" %}
-
-[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
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 03540d9..205314a 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -577,10 +577,6 @@ class CeiloAgentBasicDeployment(OpenStackAmuletDeployment):
             'DEFAULT': {
                 'logdir': '/var/log/ceilometer'
             },
-            'database': {
-                'backend': 'sqlalchemy',
-                'connection': 'sqlite:////var/lib/ceilometer/$sqlite_db'
-            }
         }
 
         for section, pairs in expected.iteritems():