From: Ildar Svetlov <isvetlov@mirantis.com>
Date: Mon, 17 Jul 2017 12:48:34 +0000 (+0400)
Subject: [MCP Newton][DEB] Update ceilometer package
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e99465796af7bb2dabd250e8d5996386ea17a981;p=openstack-build%2Fceilometer-build.git

[MCP Newton][DEB] Update ceilometer package

Version: 1:7.0.5-1~u16.04+mcp0
* Fix ceilometer services

Change-Id: Iba5321a9b60afd9f900f7ea1b34d4dda3fa03572
---

diff --git a/xenial/debian/ceilometer-agent-central.init.in b/xenial/debian/ceilometer-agent-central.init.in
index acdebbd..64b92d6 100644
--- a/xenial/debian/ceilometer-agent-central.init.in
+++ b/xenial/debian/ceilometer-agent-central.init.in
@@ -12,7 +12,10 @@
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>
-DESC="OpenStack Ceilometer Agent Central"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer Agent Central"
 PROJECT_NAME=ceilometer
-NAME=${PROJECT_NAME}-polling
+NAME=${PROJECT_NAME}-agent-central
+DAEMON=/usr/bin/ceilometer-polling
 DAEMON_ARGS=" --polling-namespaces central"
diff --git a/xenial/debian/ceilometer-agent-central.manpages b/xenial/debian/ceilometer-agent-central.manpages
deleted file mode 100644
index 5279796..0000000
--- a/xenial/debian/ceilometer-agent-central.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/mans/ceilometer-agent-central.8
diff --git a/xenial/debian/ceilometer-agent-central.postrm b/xenial/debian/ceilometer-agent-central.postrm
deleted file mode 100644
index 410f1f9..0000000
--- a/xenial/debian/ceilometer-agent-central.postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "${1}" = purge ] ; then
-	rm -f /var/log/ceilometer/ceilometer-agent-central.log*
-	[ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer
-fi
-
-#DEBHELPER#
diff --git a/xenial/debian/ceilometer-agent-compute.init.in b/xenial/debian/ceilometer-agent-compute.init.in
index 1707538..877f7f8 100644
--- a/xenial/debian/ceilometer-agent-compute.init.in
+++ b/xenial/debian/ceilometer-agent-compute.init.in
@@ -12,7 +12,10 @@
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>
-DESC="OpenStack Ceilometer Agent Compute"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer Agent Compute"
 PROJECT_NAME=ceilometer
-NAME=${PROJECT_NAME}-polling
+NAME=${PROJECT_NAME}-agent-compute
+DAEMON=/usr/bin/ceilometer-polling
 DAEMON_ARGS=" --polling-namespaces compute"
diff --git a/xenial/debian/ceilometer-agent-compute.manpages b/xenial/debian/ceilometer-agent-compute.manpages
deleted file mode 100644
index ee38e63..0000000
--- a/xenial/debian/ceilometer-agent-compute.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/mans/ceilometer-agent-compute.8
diff --git a/xenial/debian/ceilometer-agent-compute.postrm b/xenial/debian/ceilometer-agent-compute.postrm
deleted file mode 100644
index 4afe19d..0000000
--- a/xenial/debian/ceilometer-agent-compute.postrm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "${1}" = purge ] ; then
-	rm -f /var/log/ceilometer/ceilometer-agent-compute.log*
-	[ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer
-fi
-
-#DEBHELPER#
diff --git a/xenial/debian/ceilometer-agent-notification.init.in b/xenial/debian/ceilometer-agent-notification.init.in
index 595961c..57eec2f 100644
--- a/xenial/debian/ceilometer-agent-notification.init.in
+++ b/xenial/debian/ceilometer-agent-notification.init.in
@@ -12,6 +12,8 @@
 ### END INIT INFO
 
 # Author: Thomas Goirand <zigo@debian.org>
-DESC="OpenStack Ceilometer Notification Agent"
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="Ceilometer Notification Agent"
 PROJECT_NAME=ceilometer
 NAME=${PROJECT_NAME}-agent-notification
diff --git a/xenial/debian/ceilometer-agent-notification.postrm b/xenial/debian/ceilometer-agent-notification.postrm
deleted file mode 100644
index 850a970..0000000
--- a/xenial/debian/ceilometer-agent-notification.postrm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "${1}" = purge ] ; then
-	rm -f /var/log/ceilometer/ceilometer-agent-notification.log*
-	[ -d /var/log/ceilometer ] && rmdir --ignore-fail-on-non-empty /var/log/ceilometer
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 2b587fb..81e06cb 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+ceilometer (1:7.0.4-2~u16.04+mcp0) mcp; urgency=medium
+
+  * Fix ceilometer services
+
+ -- Ildar Svetlov <isvetlov@mirantis.com>  Mon, 17 Jul 2017 16:47:00 +0400
+
 ceilometer (1:7.0.4-1~u16.04+mcp0) mcp; urgency=medium
 
   * Update tag to the current one in the newton branch