Revert "Using mongodb by default."

This reverts commit 319ee78a4185a1f53d9beec8203cea4248d23005.

Rewritten-From: ce1bb8f2c2a20d61885de157efa54c48b22229b4

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 92b9c992802501600bd4bcaa0ac3c751f6cbe7ba..970683ff9a422ddce3d54440b4b43a75a48ac94f 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,2 +1 @@
 removes-sqla0.8-restrictions.patch
-using-mongodb-by-default.patch

diff --git a/trusty/debian/patches/using-mongodb-by-default.patch b/trusty/debian/patches/using-mongodb-by-default.patch
deleted file mode 100644 (file)
index 1aba25e..0000000
--- a/trusty/debian/patches/using-mongodb-by-default.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Uses mongodb by default in the connection directive
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2014-04-03
-
---- ceilometer-2014.1~rc1.orig/etc/ceilometer/ceilometer.conf.sample
-+++ ceilometer-2014.1~rc1/etc/ceilometer/ceilometer.conf.sample
-@@ -631,7 +631,7 @@
- # Deprecated group/name - [DEFAULT]/sql_connection
- # Deprecated group/name - [DATABASE]/sql_connection
- # Deprecated group/name - [sql]/connection
--#connection=sqlite:////ceilometer/openstack/common/db/$sqlite_db
-+connection=mongodb://localhost:27017/ceilometer
- 
- # The SQLAlchemy connection string used to connect to the
- # slave database (string value)