* Do not duplicate the [keystone_authtoken] in heat.conf. This was a leftover

    from the missing [keystone_authtoken] in Icehouse.

Rewritten-From: 4200def3ac9876b0d71d312293a42b80638ad8ba

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 1255da9e63e60c801a675da3641a729206895d61..fb72142e8939ee75853054a4b67e849e652d100f 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+heat (2014.2-2) experimental; urgency=medium
+
+  * Do not duplicate the [keystone_authtoken] in heat.conf. This was a leftover
+    from the missing [keystone_authtoken] in Icehouse.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 22 Oct 2014 00:38:56 +0800
+
 heat (2014.2-1) experimental; urgency=medium
 
   * New upstream release.

diff --git a/trusty/debian/keystone_authtoken b/trusty/debian/keystone_authtoken
deleted file mode 100644 (file)
index 21c3a29..0000000
--- a/trusty/debian/keystone_authtoken
+++ /dev/null
@@ -1,7 +0,0 @@
-[keystone_authtoken]
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
-admin_tenant_name = %SERVICE_TENANT_NAME%
-admin_user = %SERVICE_USER%
-admin_password = %SERVICE_PASSWORD%

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 86a6fed913987b22616639a0b5b05e6af2dff347..7697da33d7b69de0a81904c18760156c6a86e4b8 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -35,7 +35,6 @@ 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
-       cat $(CURDIR)/debian/keystone_authtoken >>$(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 ; \