Set lock_path correctly.

Rewritten-From: c365470a5a5aa13813fa621cf522177b62930dec

diff --git a/trusty/debian/control b/trusty/debian/control
index 5da44a829a850ae8bc759dc3d4a5aa200d43713d..f681e291b56c6046a24b0c9527c788caa25db990 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -7,7 +7,7 @@ Uploaders: Thomas Goirand <zigo@debian.org>,
 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 14b8cdea53a0ce7ab297fb3cb9d949a14e0e7853..8a8ce1d3914ff67f86478e0b4d5126c4a441565d 100755 (executable)
--- 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