Now generating the ceilometer.conf on the fly, since it's gone from upstream.

Change-Id: Icfabefb5decda991ea66bfd4f6278774658499a4

Rewritten-From: 4a4ae01b31d31d54344cc26ef24264a8b833849d

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 76ba8c82752ad6688988762f9ca58f1ebcc4f5e9..8724c437e05c20b8e9ee60bdea5cec47ddaaa1f8 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,3 +1,2 @@
-using-mongodb-by-default.patch
 Opencontrail_network_statistics_driver.patch
 Add_aggregator_transformer.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)

diff --git a/trusty/debian/rules b/trusty/debian/rules
index bf169c2e474146dbc35ac1587ef6a9dbcc09acac..b3611c30250b9d67e9d4314eaba43c424705a0fd 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -17,9 +17,12 @@ override_dh_clean:
 
 override_dh_install:
        dh_install
+
+       # Manage ceilometer.conf
        PYTHONPATH=. bash tools/config/generate_sample.sh -b . -p ceilometer -o $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
        mv $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
        chmod 0644 $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
+       sed -i 's|#connection=|connection=mongodb://localhost:27017/ceilometer|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
 
 override_dh_auto_build:
        dh_auto_build