Fixed upstart jobs (wrong config file path).

Change-Id: I7a74be1f3b4c3702ee90f0f99dc8598b71f01147
(cherry picked from commit 2613660b88dc6ce078c7b1157b71a1d58ec0414d)

Rewritten-From: 13275a0fef98397b1e5f6e2eec0a642892694bd4

diff --git a/xenial/debian/ceilometer-agent-central.upstart.in b/xenial/debian/ceilometer-agent-central.upstart.in
index 1427b9cf044344f78bd3fd630fec55f83e74d04c..d18092a0bc0722823cf54703e59ec30fa9d16d9b 100644 (file)
--- a/xenial/debian/ceilometer-agent-central.upstart.in
+++ b/xenial/debian/ceilometer-agent-central.upstart.in
@@ -1,4 +1,4 @@
-description "ceilometer-agent-compute"
+description "ceilometer-agent-central"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]
@@ -14,4 +14,4 @@ pre-start script
        chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-agent-central --config-file /etc/nova/nova.conf" ceilometer
+exec su -s /bin/sh -c "exec ceilometer-agent-central --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-agent-central.log" ceilometer

diff --git a/xenial/debian/ceilometer-agent-compute.upstart.in b/xenial/debian/ceilometer-agent-compute.upstart.in
index 8dc245fde124e0901355d762ca6d918434cb51ab..c37f5c89c1acd9b8594ea2ab14a7a37c8db56a7e 100644 (file)
--- a/xenial/debian/ceilometer-agent-compute.upstart.in
+++ b/xenial/debian/ceilometer-agent-compute.upstart.in
@@ -14,4 +14,4 @@ pre-start script
        chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-agent-compute --config-file /etc/nova/nova.conf" ceilometer
+exec su -s /bin/sh -c "exec ceilometer-agent-compute --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-agent-compute.log" ceilometer

diff --git a/xenial/debian/ceilometer-api.upstart.in b/xenial/debian/ceilometer-api.upstart.in
index c37991ee0c869a492d30ab8dedafeea177697593..5e9ff3e6e4ad3f813072a1212c9c5f9434cd1e9e 100644 (file)
--- a/xenial/debian/ceilometer-api.upstart.in
+++ b/xenial/debian/ceilometer-api.upstart.in
@@ -1,4 +1,4 @@
-description "ceilometer-agent-compute"
+description "ceilometer-api"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]
@@ -14,4 +14,4 @@ pre-start script
        chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-api -d -v --log-dir=/var/log/ceilometer" ceilometer
+exec su -s /bin/sh -c "exec ceilometer-api --log-file /var/log/ceilometer/ceilometer-api.log --config-file /etc/ceilometer/ceilometer.conf" ceilometer

diff --git a/xenial/debian/ceilometer-collector.upstart.in b/xenial/debian/ceilometer-collector.upstart.in
index 6670063b6d156d2488a93389e61d9f908a8382c2..2a60710b6d864b97306c70fe4b74050270261f1a 100644 (file)
--- a/xenial/debian/ceilometer-collector.upstart.in
+++ b/xenial/debian/ceilometer-collector.upstart.in
@@ -1,4 +1,4 @@
-description "ceilometer-agent-compute"
+description "ceilometer-collector"
 author "Chuck Short <zulcss@ubuntu.com>"
 
 start on runlevel [2345]
@@ -14,4 +14,4 @@ pre-start script
        chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-collector --config-file /etc/nova/nova.conf" ceilometer
+exec su -s /bin/sh -c "exec ceilometer-collector --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-collector.log" ceilometer