Updated namespaces when generating the config file.

Rewritten-From: c7caa6f0ab1349e09745c17c600eb6b5d7532e4f

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index a8ad917f7a13fe7e5dcf196fb7c0af71248c1ad7..118affdd3d693fb2e39738c65399d31af39ff053 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -4,6 +4,7 @@ ceilometer (1:6.0.0~b2-1) experimental; urgency=medium
   * Fixed (build-)depends for this release.
   * The alarm packages are now transition packages to Aodh.
   * Fixed debian/copyright ordering.
+  * Updated namespaces when generating the config file.
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 08 Dec 2015 11:53:07 +0100
 

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 7f7a2e41e68e7e1ee0934da349d1a98df4064b65..830f8d6f9cf26161f9cb6b6390dfb508537621c9 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -13,15 +13,23 @@ override_dh_clean:
        rm -f debian/ceilometer-common.config debian/ceilometer-common.postinst debian/ceilometer-api.config debian/ceilometer-api.postinst
 
 override_dh_install:
+       rm -rf $(CURDIR)/debian/tmp
+       python2.7 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp
        dh_install --fail-missing
 
        # Manage ceilometer.conf
        mkdir -p $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common
-       oslo-config-generator --output-file $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf \
+       PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
+               --output-file $(CURDIR)/debian/ceilometer-common/usr/share/ceilometer-common/ceilometer.conf \
+               --wrap-width 140 \
                --namespace ceilometer \
+               --namespace oslo.concurrency \
                --namespace oslo.db \
+               --namespace oslo.log \
                --namespace oslo.messaging \
+               --namespace oslo.middleware.cors \
                --namespace oslo.policy \
+               --namespace oslo.service.service \
                --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