From 9690445aa8ceb0ac5e72178a2ca9cf1b7731ab54 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 2 Oct 2014 20:38:39 +0800 Subject: [PATCH] Do not package cinder-keystone-setup Rewritten-From: 50890cae893f5dbe47ef2d95868c0db941240622 --- trusty/debian/changelog | 2 +- trusty/debian/heat-common.install | 1 - trusty/debian/rules | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 5ba05eb4..7a215c59 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,6 +1,6 @@ heat (2014.2~rc1-2) experimental; urgency=medium - * Also package /usr/bin/{cinder-keystone-setup,heat-keystone-setup-domain}. + * Also package /usr/bin/heat-keystone-setup-domain. * Using the --fail-missing option when calling dh_install. -- Thomas Goirand Thu, 02 Oct 2014 20:27:08 +0800 diff --git a/trusty/debian/heat-common.install b/trusty/debian/heat-common.install index 7bd7384e..4a62cf2b 100644 --- a/trusty/debian/heat-common.install +++ b/trusty/debian/heat-common.install @@ -1,7 +1,6 @@ /usr/bin/heat-db-setup /usr/bin/heat-keystone-setup /usr/bin/heat-manage -/usr/bin/cinder-keystone-setup /usr/bin/heat-keystone-setup-domain etc/heat/api-paste.ini etc/heat/environment.d/default.yaml diff --git a/trusty/debian/rules b/trusty/debian/rules index 2aa91983..33d092cc 100755 --- a/trusty/debian/rules +++ b/trusty/debian/rules @@ -32,7 +32,7 @@ override_dh_clean: debian/heat-common.config override_dh_install: - dh_install --fail-missing + 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 \ -- 2.45.2