From 7ce484e4536b3154b7c81f35f847b11eaa938c93 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Wed, 22 Oct 2014 00:40:20 +0800 Subject: [PATCH] * Do not duplicate the [keystone_authtoken] in heat.conf. This was a leftover from the missing [keystone_authtoken] in Icehouse. Rewritten-From: 4200def3ac9876b0d71d312293a42b80638ad8ba --- trusty/debian/changelog | 7 +++++++ trusty/debian/keystone_authtoken | 7 ------- trusty/debian/rules | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 trusty/debian/keystone_authtoken diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 1255da9e..fb72142e 100644 --- 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 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 index 21c3a29a..00000000 --- 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 86a6fed9..7697da33 100755 --- 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 ; \ -- 2.45.2