From: Thomas Goirand <zigo@debian.org>
Date: Fri, 29 Jan 2016 03:42:17 +0000 (+0800)
Subject: Fixed config file generation.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c8c2b1194009d4dcbd3fa4062367938f906e158f;p=openstack-build%2Fneutron-lbaas-build.git

Fixed config file generation.

Rewritten-From: b4dcebf4ac054c422c204e85706ba6cd0cab5884
---

diff --git a/xenial/debian/neutron-lbaas-agent.install b/xenial/debian/neutron-lbaas-agent.install
index 06de09c..d958504 100644
--- a/xenial/debian/neutron-lbaas-agent.install
+++ b/xenial/debian/neutron-lbaas-agent.install
@@ -1,6 +1,3 @@
 usr/etc/neutron/rootwrap.d/lbaas-haproxy.filters	/etc/neutron/rootwrap.d
-usr/etc/neutron/lbaas_agent.ini		/etc/neutron
-usr/etc/neutron/services_lbaas.conf	/etc/neutron
-usr/etc/neutron/neutron_lbaas.conf	/etc/neutron
 usr/bin/neutron-lbaasv2-agent
 usr/bin/neutron-lbaas-agent
diff --git a/xenial/debian/rules b/xenial/debian/rules
index 9e6e344..f899aad 100755
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -11,8 +11,30 @@ PYTHONS:=$(shell pyversions -vr)
 	dh $@ --buildsystem=python_distutils --with python2,systemd
 
 override_dh_install:
+	rm -rf $(CURDIR)/debian/tmp
+	python2.7 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp
+
+	# lbaas_agent.ini
+	mkdir -p $(CURDIR)/debian/neutron-lbaas-agent/etc/neutron
+	PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
+		--output-file $(CURDIR)/debian/neutron-lbaas-agent/etc/neutron/lbaas_agent.ini
+		--wrap-width 140 \
+		--namespace neutron.lbaas.agent \
+		--namespace oslo.log
+
+	# neutron_lbaas.conf
+	PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
+		--output-file $(CURDIR)/debian/neutron-lbaas-agent/etc/neutron/neutron_lbaas.conf \
+		--wrap-width 140 \
+		--namespace neutron.lbaas
+
+	# services_lbaas.conf
+	PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \
+		--output-file $(CURDIR)/debian/neutron-lbaas-agent/etc/neutron/services_lbaas.conf \
+		--wrap-width 140 \
+		--namespace neutron.lbaas.service
+
 	dh_install -O--buildsystem=python_distutils --fail-missing
-	install -D -m 0644 etc/neutron_lbaas.conf $(CURDIR)/debian/neutron-lbass/etc/neutron/neutron_lbaas.conf
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))