[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 acdebbd4d4f456475402243edde64b2eeb3bfa9f..64b92d6036adf4d7dfc9ecb65e70694634681be8 100644 (file)
--- 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 (file)
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 (file)
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 17075387359f166657652a9f777ed6f41be17cea..877f7f823f0150016d607df811b04f7a89f8c6e7 100644 (file)
--- 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 (file)
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 (file)
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 595961cc7e647148ebca7aac7816e9e52d6d61d3..57eec2f6961f2ef3998824bedb96b677cb14bceb 100644 (file)
--- 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 (file)
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 2b587fbfec14fbe4498cbfab50977b13bbdeb328..81e06cbec7a09d4c9af016d6c6f125ab0097c9e2 100644 (file)
--- 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