Do not package cinder-keystone-setup

Rewritten-From: 50890cae893f5dbe47ef2d95868c0db941240622

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 5ba05eb4f24bfcf7b7a250638000fdae7dc1e8d0..7a215c590c8db70f38085f163f5f3c1ab88279cf 100644 (file)
--- 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 <zigo@debian.org>  Thu, 02 Oct 2014 20:27:08 +0800

diff --git a/trusty/debian/heat-common.install b/trusty/debian/heat-common.install
index 7bd7384e7a4bab2d9a514e7a3e6f8811f7f8e2f5..4a62cf2b96d6a9901cdacc7373453b57a94602df 100644 (file)
--- 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 2aa919839e2c7b2db6a11ac6039a2f28932e4517..33d092cc7ae5440cdc26aecb34e5032ae02636e8 100755 (executable)
--- 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 \