From: Thomas Goirand Date: Tue, 10 Feb 2015 15:43:09 +0000 (+0100) Subject: Do not install heat.conf.sample from etc/heat in upstream source (it's generated... X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d7ff688f2b0f63726bcc7bcd073786ab6e59ea6a;p=openstack-build%2Fheat-build.git Do not install heat.conf.sample from etc/heat in upstream source (it's generated from oslo-config-generator) Rewritten-From: ae3d5a95a796c5799b28d750c1d363bdb36cff42 --- diff --git a/trusty/debian/rules b/trusty/debian/rules index 1f857d2c..67adcb44 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -55,8 +55,6 @@ override_dh_install: sed -i 's|^[# \t]*connection[\t #]*=.*|connection=sqlite:////var/lib/heat/heatdb|' $(CURDIR)/debian/heat-common/usr/share/heat-common/heat.conf 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 ; \