Do not install heat.conf.sample from etc/heat in upstream source (it's generated...

Rewritten-From: ae3d5a95a796c5799b28d750c1d363bdb36cff42

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 1f857d2c6017cc202f1065b3bd8d52330003cbcc..67adcb44d79dc9b7fc2fbb04e33f24ba27b5fae3 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/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 ; \