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

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

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 32507bfb5cc46d765426ed94d77ab00f8fc6af61..b17160a3d2495829bb3d585ca39c399c754c0bba 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -20,8 +20,12 @@ 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
 
@@ -44,7 +48,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
        testr init
        set -e && \
                TEMP_REZ=`mktemp -t` && \
-               bash -x ./setup-test-env.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit || true ; \
+               bash -x ./setup-test-env-mongodb.sh testr run --subunit 'tests\.(?!.*test_bin.*)' | tee $$TEMP_REZ | subunit2pyunit || true ; \
                cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats || true ; \
                rm -f $$TEMP_REZ ;
        testr slowest