From d8c6eacd12a86fa746d254e7bdc2984ac6857b1a Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Tue, 1 Jul 2014 15:13:59 +0800 Subject: [PATCH] Now generating the ceilometer.conf on the fly, since it's gone from upstream. Change-Id: Icfabefb5decda991ea66bfd4f6278774658499a4 Rewritten-From: 4a4ae01b31d31d54344cc26ef24264a8b833849d --- trusty/debian/patches/series | 1 - .../patches/using-mongodb-by-default.patch | 16 ---------------- trusty/debian/rules | 3 +++ 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 trusty/debian/patches/using-mongodb-by-default.patch diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index 76ba8c8..8724c43 100644 --- 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 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 -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 bf169c2..b3611c3 100755 --- 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 -- 2.32.3