Disable https for the default keystone conf, as this makes our CI fail.

diff --git a/debian/changelog b/debian/changelog
index 47cb54a27a122b633fd1f0ab6ff367fe65c1760d..14bdd30770510f59af469839e0fa8bb376b4901b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cinder (2014.1-5) unstable; urgency=medium
+
+  * Disable https for the default keystone conf, as this makes our CI fail.
+
+ -- Thomas Goirand <zigo@debian.org>  Mon, 05 May 2014 13:14:58 +0800
+
 cinder (2014.1-4) unstable; urgency=medium
 
   * Updated intalian debconf translations (Closes: #745386).

diff --git a/debian/rules b/debian/rules
index 695b33b93244289b0175cbab24f8c565c14adbdf..3d7eca81df011bb7c5f9a5c3527278a776945fd8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,8 @@ override_dh_install:
        dh_install --fail-missing -Xbin/cinder-all
        install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common
        install -D -m 0644 $(CURDIR)/etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+       # Disable https in default setup, as this makes our CI fail
+       sed -i 's/#auth_protocol=https/auth_protocol=http/' $(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
        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