sed -i "s/#auth_strategy=noauth/auth_strategy=keystone/" in the default packaged...

diff --git a/debian/changelog b/debian/changelog
index 9566db72d91a05ce64f3dbdb1c86407b0b394ec6..69383ab7b7257975c917c04e8959fe5e98aafee9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ cinder (2013.2~rc1-3) UNRELEASED; urgency=low
   * Kills the CEPH_ARGS hack in /etc/default/cinder and cinder-volume.init
     since that's not needed anymore (upstream code manages this now in the
     configuration file directly).
+  * sed -i "s/#auth_strategy=noauth/auth_strategy=keystone/" in the default
+    packaged cinder.conf (otherwise it doesn't work by default).
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 11 Oct 2013 22:54:46 +0800
 

diff --git a/debian/rules b/debian/rules
index 03d6cfd48000a1c64539655ba18d6516d0d5eb8c..6a06e59e3724e39d6826eddde22d180063397bd9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,7 @@ override_dh_install:
        sed -i 's|#rootwrap_config=<None>|rootwrap_config=/etc/cinder/rootwrap.conf|' $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common
        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
+       sed -i "s/#auth_strategy=noauth/auth_strategy=keystone/" $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
 
 override_dh_fixperms:
        dh_fixperms -Xcinder_tgt.conf