From 39ee46e020fda6a46a80d42e478bc094f8b104de Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 1 Feb 2016 16:52:37 +0800 Subject: [PATCH] Set lock_path correctly. Rewritten-From: c365470a5a5aa13813fa621cf522177b62930dec --- trusty/debian/control | 2 +- trusty/debian/rules | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/trusty/debian/control b/trusty/debian/control index 5da44a829..f681e291b 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -7,7 +7,7 @@ Uploaders: Thomas Goirand , Build-Depends: debhelper (>= 9), dh-python, dh-systemd, - openstack-pkg-tools (>= 23~), + openstack-pkg-tools (>= 38~), po-debconf, python-all, python-pbr (>= 1.8), diff --git a/trusty/debian/rules b/trusty/debian/rules index 14b8cdea5..8a8ce1d39 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -118,6 +118,7 @@ override_dh_install: sed -i 's|^[ #\t]*rabbit_userid[ \t]*=.*|rabbit_userid = guest|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf sed -i 's|^[ #\t]*rabbit_password[ \t]*=.*|rabbit_password = guest|' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf sed -i 's/^[ \t#]*auth_protocol[ \t]*=[ \t].*/auth_protocol = http/' $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf + pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf oslo_concurrency lock_path /var/lock/neutron # openvswitch_agent.ini mkdir -p $(CURDIR)/debian/neutron-common/usr/share/neutron-common -- 2.45.2