Using auth_protocol=http by default.

Change-Id: I50a727114647037d374290e3d7aaddac86d3d958

Rewritten-From: e9f0722ecc2b20b8ce9b8a2a27b2fd6eb0cabf18

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index cb7ef4f3651d98b86ce7bcb7a325f7691a160374..9a63e734a5c559a9de4305f726f56098deed1dfd 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (2014.2-4) UNRELEASED; urgency=medium
+
+  * Using auth_protocol=http by default.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 22 Oct 2014 16:29:29 +0800
+
 ceilometer (2014.2-3) experimental; urgency=medium
 
   * Added argparse & ordereddict to debian/pydist-overrides.

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 32507bfb5cc46d765426ed94d77ab00f8fc6af61..1d6cd3abeb5107708d74f8020ceb6b10e38aade5 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -22,6 +22,7 @@ override_dh_install:
        mkdir -p $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
        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
+       sed -i 's|[# \t]*auth_protocol[\t ]*=.*|auth_protocol=http|' $(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