* Using oslo-config-generator directly.

* Switching to openstack-pkg-tools >= 52~.

debian/changelog

@@ -5,6 +5,8 @@ ironic (1:6.0.0-1) experimental; urgency=medium
   * Added new pt_BR.po Brazilian Portuguese debconf templates translation
     (Closes: #829340).
   * Rebase allow-any-pytz-version.patch. Add allow-any-fixtures-version.patch.
+  * Using oslo-config-generator directly.
+  * Switching to openstack-pkg-tools >= 52~.
 
  -- Thomas Goirand <zigo@debian.org>  Wed, 29 Jun 2016 22:44:18 +0200
 

debian/control

@@ -6,7 +6,7 @@ Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
-               openstack-pkg-tools (>= 40~),
+               openstack-pkg-tools (>= 52~),
                po-debconf,
                python-all,
                python-pbr (>= 1.8),

debian/rules

@@ -1,10 +1,7 @@
 #!/usr/bin/make -f
 
-PYTHONS:=$(shell pyversions -vr)
 include /usr/share/openstack-pkg-tools/pkgos.make
 
-export OSLO_PACKAGE_VERSION=$(VERSION)
-
 %:
 	dh $@ --buildsystem=python_distutils --with python2,sphinxdoc,systemd
 
@@ -22,12 +19,24 @@ override_dh_auto_build:
 	/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func ironic-api.postinst
 
 override_dh_auto_install:
-	dh_auto_install -O--buildsystem=python_distutils
-	# TODO: replace this by generated conf file (see tox.ini)
+	python setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp
 	mkdir -p $(CURDIR)/debian/ironic-common/usr/share/ironic-common
-	bash tools/config/generate_sample.sh -b . -p ironic -o $(CURDIR)/debian/ironic-common/usr/share/ironic-common
-	mv  $(CURDIR)/debian/ironic-common/usr/share/ironic-common/ironic.conf.sample $(CURDIR)/debian/ironic-common/usr/share/ironic-common/ironic.conf
-	#install -D -m 0664 etc/ironic/ironic.conf.sample $(CURDIR)/debian/ironic-common/usr/share/ironic-common/ironic.conf
+	PYTHONPATH=$(CURDIR)/debian/tmp oslo-config-generator --output-file $(CURDIR)/debian/ironic-common/usr/share/ironic-common/ironic.conf \
+		--wrap-width 140 \
+		--namespace ironic \
+		--namespace ironic_lib.disk_utils \
+		--namespace ironic_lib.disk_partitioner \
+		--namespace ironic_lib.utils \
+		--namespace oslo.db \
+		--namespace oslo.messaging \
+		--namespace oslo.middleware.cors \
+		--namespace oslo.concurrency \
+		--namespace oslo.policy \
+		--namespace oslo.log \
+		--namespace oslo.service.service \
+		--namespace oslo.service.periodic_task \
+		--namespace oslo.service.sslutils \
+		--namespace keystonemiddleware.auth_token
 	sed -i 's|#connection=<None>|connection=sqlite:////var/lib/ironic/ironicdb|' $(CURDIR)/debian/ironic-common/usr/share/ironic-common/ironic.conf
 	set -e ; for pyvers in $(PYTHONS); do \
 		cp -rf ironic/db/sqlalchemy/alembic $(CURDIR)/debian/tmp/usr/lib/python$$pyvers/dist-packages/ironic/db/sqlalchemy ; \