From 4f2d0c245fcd19463e80167111d59ad86ff959a9 Mon Sep 17 00:00:00 2001
From: Thomas Goirand <thomas@goirand.fr>
Date: Thu, 13 Dec 2012 06:17:33 +0000
Subject: [PATCH] metadata is gone from upstream, so removing it from the
 package as well.

Rewritten-From: 2d202418c083bd78746bee998b05d8fac01ceea1
---
 trusty/debian/control                 | 12 ----
 trusty/debian/heat-metadata.init      | 87 ---------------------------
 trusty/debian/heat-metadata.install   |  3 -
 trusty/debian/heat-metadata.logrotate |  4 --
 trusty/debian/heat-metadata.manpages  |  1 -
 5 files changed, 107 deletions(-)
 delete mode 100644 trusty/debian/heat-metadata.init
 delete mode 100644 trusty/debian/heat-metadata.install
 delete mode 100644 trusty/debian/heat-metadata.logrotate
 delete mode 100644 trusty/debian/heat-metadata.manpages

diff --git a/trusty/debian/control b/trusty/debian/control
index 8e2b55a7..ef1280e1 100644
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -138,15 +138,3 @@ Description: service to orchestrate multiple composite cloud applications (Cloud
  CloudFormation-compatible Query API.
  .
  This package contains the cloudwatch API.
-
-Package: heat-metadata
-Architecture: all    
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: ${ostack-lsb-base}, ${python:Depends}, ${misc:Depends}, heat-common (=${binary:Version}),
- adduser
-Description: service to orchestrate multiple composite cloud applications (metadata API)
- Heat is a service to orchestrate multiple composite cloud applications using
- templates, through both an OpenStack-native ReST API and a
- CloudFormation-compatible Query API.
- .
- This package contains the metadata API.
diff --git a/trusty/debian/heat-metadata.init b/trusty/debian/heat-metadata.init
deleted file mode 100644
index 6e20b8d8..00000000
--- a/trusty/debian/heat-metadata.init
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          heat-metadata
-# Required-Start:    $network $local_fs $remote_fs $syslog
-# Required-Stop:     $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Heat metadata
-# Description:       Heat metadata server
-### END INIT INFO
-
-# Author: Thomas Goirand <zigo@debian.or>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="Heat metadata"
-NAME=heat-metadata
-DAEMON=/usr/bin/heat-metadata
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-SYSTEM_USER=heat
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-. /lib/lsb/init-functions
-
-if [ ! -e /var/log/heat ] ; then
-	mkdir -p /var/log/heat
-	chown ${SYSTEM_USER} /var/log/heat
-fi
-
-do_start () {
-	start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON --test > /dev/null || return 1
-	start-stop-daemon --start --background --quiet --chuid ${SYSTEM_USER}:${SYSTEM_USER} --make-pidfile --pidfile $PIDFILE --startas $DAEMON || return 2
-}
-
-do_stop () {
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE
-	RETVAL="$?"
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-case "$1" in
-  start)
-    log_daemon_msg "Starting $DESC" "$NAME"
-    do_start
-    case "$?" in
-                0|1) log_end_msg 0 ;;
-                2) log_end_msg 1 ;;
-        esac
-  ;;
-  stop)
-        log_daemon_msg "Stopping $DESC" "$NAME"
-        do_stop
-        case "$?" in
-                0|1) log_end_msg 0 ;;
-                2) log_end_msg 1 ;;
-        esac
-        ;;
-  status)   
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  restart|force-reload)
-        log_daemon_msg "Restarting $DESC" "$NAME"
-        do_stop
-        case "$?" in
-          0|1)
-                do_start
-                case "$?" in
-                        0) log_end_msg 0 ;;
-                        1) log_end_msg 1 ;; # Old process is still running
-                        *) log_end_msg 1 ;; # Failed to start
-                esac
-                ;;
-          *)
-                # Failed to stop
-                log_end_msg 1
-                ;;
-        esac   
-        ;;
-  *)
-        echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-        exit 3
-        ;;
-esac
diff --git a/trusty/debian/heat-metadata.install b/trusty/debian/heat-metadata.install
deleted file mode 100644
index dfaf1144..00000000
--- a/trusty/debian/heat-metadata.install
+++ /dev/null
@@ -1,3 +0,0 @@
-etc/heat/heat-metadata.conf
-etc/heat/heat-metadata-paste.ini
-usr/bin/heat-metadata
diff --git a/trusty/debian/heat-metadata.logrotate b/trusty/debian/heat-metadata.logrotate
deleted file mode 100644
index bbe03fc0..00000000
--- a/trusty/debian/heat-metadata.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/heat/metadata.log {
-    daily
-    missingok
-}
diff --git a/trusty/debian/heat-metadata.manpages b/trusty/debian/heat-metadata.manpages
deleted file mode 100644
index 1c8302fc..00000000
--- a/trusty/debian/heat-metadata.manpages
+++ /dev/null
@@ -1 +0,0 @@
-docs/man/man1/heat-metadata.1
-- 
2.45.2