From: Thomas Goirand Date: Fri, 10 Oct 2014 14:33:04 +0000 (+0000) Subject: Adds patch for generating the config file correctly. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=0ce6da254277821a042fc8638e69d05662ea2a4b;p=openstack-build%2Fceilometer-build.git Adds patch for generating the config file correctly. Rewritten-From: 6ef20da4dc0fc37691ed4020feae22b7d8883be4 --- diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 4fba771..a5684f4 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,9 @@ +ceilometer (2014.2~rc1-4) experimental; urgency=medium + + * Adds patch for generating the config file correctly. + + -- Thomas Goirand Fri, 10 Oct 2014 14:32:36 +0000 + ceilometer (2014.2~rc1-3) experimental; urgency=medium * Using a single unique ceilometer-common logrotate file. diff --git a/trusty/debian/patches/Add_oslo.db_to_config_generator.patch b/trusty/debian/patches/Add_oslo.db_to_config_generator.patch new file mode 100644 index 0000000..21d4c5d --- /dev/null +++ b/trusty/debian/patches/Add_oslo.db_to_config_generator.patch @@ -0,0 +1,18 @@ +Description: Add oslo.db to config generator + Otherwise we miss the oslo.db configuration option in the sample config file. +From: Julien Danjou +Origin: upstream, https://review.openstack.org/#/c/127543/ +Date: Fri, 10 Oct 2014 14:25:58 +0000 (+0200) +X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fceilometer.git;a=commitdiff_plain;h=e179a8382c88374c7fefcb8f1295257a740b7668 +Bug-Ubuntu: https://launchpad.net/bugs/1379808 +Change-Id: I3a70e5da42562081002286d37ba1a200150c8cfc +Last-Update: 2014-10-10 + +diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc +index d964585..122e9fe 100644 +--- a/tools/config/oslo.config.generator.rc ++++ b/tools/config/oslo.config.generator.rc +@@ -1,2 +1,2 @@ +-CEILOMETER_CONFIG_GENERATOR_EXTRA_LIBRARIES=oslo.messaging ++CEILOMETER_CONFIG_GENERATOR_EXTRA_LIBRARIES="oslo.messaging oslo.db" + CEILOMETER_CONFIG_GENERATOR_EXTRA_MODULES=keystonemiddleware.auth_token diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series new file mode 100644 index 0000000..59a1394 --- /dev/null +++ b/trusty/debian/patches/series @@ -0,0 +1 @@ +Add_oslo.db_to_config_generator.patch diff --git a/trusty/debian/rules b/trusty/debian/rules index 3a91a36..32507bf 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -23,7 +23,7 @@ override_dh_install: 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/ceilometer.conf.sample $(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 + 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