X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fceilometer-collector.upstart.in;h=744bfe61d79e9c52ac6a111ceddb56e5eaa3295f;hb=7aa3467f8175bf4798b3baae98e03db463b5260d;hp=6670063b6d156d2488a93389e61d9f908a8382c2;hpb=534d7372275ddc96939cc0abe96ab8eda4767ef3;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/ceilometer-collector.upstart.in b/trusty/debian/ceilometer-collector.upstart.in
index 6670063..744bfe6 100644
--- a/trusty/debian/ceilometer-collector.upstart.in
+++ b/trusty/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,12 @@ 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
+script
+	[ -r /etc/default/openstack ] && . /etc/default/openstack
+	[ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
+
+	[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+	[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file /var/log/ceilometer/$UPSTART_JOB.log"
+
+	exec su -s /bin/sh -c "exec ceilometer-collector --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script