From d2516ab32e7056dc7743662a7094fc9aeff59281 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 23 Jun 2016 17:34:43 +0200 Subject: [PATCH] Fix some default values for lbaas-agent Rewritten-From: efb658903804a9042d3e19c8b7e737a38862e703 --- xenial/debian/neutron-lbaas-agent.init.in | 2 +- xenial/debian/rules | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xenial/debian/neutron-lbaas-agent.init.in b/xenial/debian/neutron-lbaas-agent.init.in index 858fdac..571d40e 100644 --- a/xenial/debian/neutron-lbaas-agent.init.in +++ b/xenial/debian/neutron-lbaas-agent.init.in @@ -20,4 +20,4 @@ PROJECT_NAME=neutron NAME=${PROJECT_NAME}-lbaas-agent # --config-file=/etc/neutron/neutron.conf will be happened # to DAEMON_ARGS later by openstack-pkg-tools -DAEMON_ARGS="--config-file=/etc/neutron/lbaas_agent.ini --config-file=/etc/neutron/neutron_lbaas.conf" +DAEMON_ARGS="--config-file=/etc/neutron/lbaas_agent.ini --config-file=/etc/neutron/services_lbaas.conf --config-file=/etc/neutron/neutron_lbaas.conf" diff --git a/xenial/debian/rules b/xenial/debian/rules index efb6fa8..a193cfc 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -21,6 +21,7 @@ override_dh_install: --wrap-width 140 \ --namespace neutron.lbaas.agent \ --namespace oslo.log + pkgos-fix-config-default $(CURDIR)/debian/neutron-lbaas-common/etc/neutron/lbaas_agent.ini DEFAULT interface_driver openvswitch # neutron_lbaas.conf PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \ @@ -33,6 +34,7 @@ override_dh_install: --output-file $(CURDIR)/debian/neutron-lbaas-common/etc/neutron/services_lbaas.conf \ --wrap-width 140 \ --namespace neutron.lbaas.service + pkgos-fix-config-default $(CURDIR)/debian/neutron-lbaas-common/etc/neutron/services_lbaas.conf service_providers service_provider LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default dh_install -O--buildsystem=python_distutils --fail-missing -- 2.45.2