]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
Set autho_protocol=http by default.
authorThomas Goirand <thomas@goirand.fr>
Wed, 22 Oct 2014 08:22:53 +0000 (16:22 +0800)
committerThomas Goirand <thomas@goirand.fr>
Wed, 22 Oct 2014 08:22:53 +0000 (16:22 +0800)
Rewritten-From: bbe779b11dc5a51059f6ed67470972a96535fe4c

trusty/debian/rules

index 7697da33d7b69de0a81904c18760156c6a86e4b8..1f03b27d1387576c7564e08633acf1096622617f 100755 (executable)
@@ -35,6 +35,7 @@ override_dh_clean:
 override_dh_install:
        dh_install --fail-missing -Xbin/cinder-keystone-setup
        install -D -m 0640 etc/heat/heat.conf.sample $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf
+       sed -i 's|[# ]*auth_protocol[# ]*=.*|auth_protocol=http|' $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf
        set -e && for pyvers in $(PYTHONS); do \
                mkdir -p $(CURDIR)/debian/python-heat/usr/lib/python$$pyvers/dist-packages/heat/plugins ; \
                cp -rf contrib/heat_keystoneclient_v2/heat_keystoneclient_v2 $(CURDIR)/debian/python-heat/usr/lib/python$$pyvers/dist-packages/heat/plugins ; \