Fixed default connection sed command line.

[openstack-build/ceilometer-build.git] / xenial / debian / rules

diff --git a/xenial/debian/rules b/xenial/debian/rules
index baaf59d7b4aae674fd64cb51736f4f50ce50f4ac..79608a6157635883d82b497b27126e29198c7615 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -20,11 +20,14 @@ 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
+       sed -i 's|#connection[ \t]*=.*|connection=mongodb://localhost:27017/ceilometer|' $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf
 
 override_dh_auto_build:
        dh_auto_build