Fixed the default path for lock_path.

Rewritten-From: 711d62503c92f362a08ea65872226dd4e855e7ff

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 3f0d750429a91d0e116c398124008271e02d67e9..9eb87ff5edbc250623c4beae9828b1d5d45d6c10 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -3,6 +3,7 @@ cinder (2:7.0.0~rc1-2) experimental; urgency=medium
   * cinder-api depends on python-openstackclient.
   * Fixed cinder.conf generation.
   * cinder-api also registering the volumev2 type.
+  * Fixed the default path for lock_path.
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 29 Sep 2015 13:23:42 +0000
 

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 5126faffd397cb424946918529e093d32f3809a8..883f3d39368813484c1890a8c18cb4297b0b32ad 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -59,14 +59,17 @@ override_dh_install:
        ./debian/gen-fixed-config
        #cp etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
 
+       # Set a default value for lock_path
+       sed -i 's|^[ \t#]*lock_path[ \t]*=.*|lock_path = /var/lock/cinder|' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+
        # Disable https in default setup, as this makes our CI fail
-       sed -i 's/^[ \t#]*auth_protocol[ \t]*=[ \t].*/auth_protocol = http/' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+       sed -i 's/^[ \t#]*auth_protocol[ \t]*=.*/auth_protocol = http/' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
 
        # Default to keystone auth
        sed -i "s/#auth_strategy=noauth/auth_strategy=keystone/" $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
 
        # Write only in /var/lib/cinder please
-       sed -i 's|#state_path=$pybasedir|state_path=/var/lib/cinder|' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+       sed -i 's|#[ \t#]*state_path[ \t]*=.*|state_path=/var/lib/cinder|' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
 
        # Fix the missing sql_connection directive
        #echo "# Connection to db:" >>$(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf