From: Thomas Goirand Date: Mon, 5 May 2014 05:16:00 +0000 (+0800) Subject: Disable https for the default keystone conf, as this makes our CI fail. X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=26fe51f495a1136ec352fb7b67e082a495baf2fc;p=openstack-build%2Fcinder-build.git Disable https for the default keystone conf, as this makes our CI fail. Rewritten-From: f49c22369ea04d2c8fbf64e8bc69787abc86268f --- diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 47cb54a27..14bdd3077 100644 --- a/xenial/debian/changelog +++ b/xenial/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 Mon, 05 May 2014 13:14:58 +0800 + cinder (2014.1-4) unstable; urgency=medium * Updated intalian debconf translations (Closes: #745386). diff --git a/xenial/debian/rules b/xenial/debian/rules index 695b33b93..3d7eca81d 100755 --- a/xenial/debian/rules +++ b/xenial/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=|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