Updated the config file generation to use what upstream uses now.

Change-Id: Ie355e0d38be5c0ca7cb2d039276d953af176880e

Rewritten-From: 3828b311e0b60eeedbb5d45c10da54c497661dd9

diff --git a/xenial/debian/rules b/xenial/debian/rules
index baaf59d7b4aae674fd64cb51736f4f50ce50f4ac..b17160a3d2495829bb3d585ca39c399c754c0bba 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -20,8 +20,11 @@ override_dh_install:
 
        # Manage ceilometer.conf
        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
+       oslo-config-generator --output-file $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf \
+               --namespace ceilometer \
+               --namespace oslo.db \
+               --namespace oslo.messaging \
+               --namespace keystonemiddleware.auth_token
        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