Fix generation of config file again.

Rewritten-From: 53e016481d7ae1f69a8b88ea1348cb966ae48d6a

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 0e5bfd01d9ddd6385d9e5abb78b692c18c5646cf..09def9d3922862a1818fa8ea6e9fad2771458018 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -63,8 +63,8 @@ override_dh_install:
        sed -i 's|#state_path=$pybasedir|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
-       echo "sql_connection = sqlite:////var/lib/cinder/cinderdb" >>$(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+       #echo "# Connection to db:" >>$(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+       #echo "sql_connection = sqlite:////var/lib/cinder/cinderdb" >>$(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
 
        install -D -m 0644 $(CURDIR)/etc/cinder/logging_sample.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/logging.conf