X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=trusty%2Fdebian%2Fceilometer-collector.init;h=205bf42f5fe2249250cc5df3d6082d52072f37b2;hb=aa90ce810f15249bd063dcd049e4de3e8f140a9b;hp=7ba862e1b71167a545c4e2aa17f40c7c5521dfbd;hpb=534d7372275ddc96939cc0abe96ab8eda4767ef3;p=openstack-build%2Fceilometer-build.git

diff --git a/trusty/debian/ceilometer-collector.init b/trusty/debian/ceilometer-collector.init
index 7ba862e..205bf42 100644
--- a/trusty/debian/ceilometer-collector.init
+++ b/trusty/debian/ceilometer-collector.init
@@ -3,6 +3,8 @@
 # Provides:          ceilometer-collector
 # Required-Start:    $network $local_fs $remote_fs $syslog
 # Required-Stop:     $remote_fs
+# Should-Start:      mongodb rabbitmq-server
+# Should-Stop:       mongodb rabbitmq-server
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: ceilometer collector
@@ -17,8 +19,6 @@ DESC="Ceilometer Collector"
 SYS_NAME=ceilometer
 NAME=ceilometer-collector
 DAEMON=/usr/bin/${NAME}
-DAEMON_ARGS="--config-file /etc/nova/nova.conf"
-[ -f '/etc/nova/nova-compute.conf' ] && DAEMON_ARGS=${DAEMON_ARGS}" --config-file=/etc/nova/nova-compute.conf"
 
 SCRIPTNAME=/etc/init.d/${NAME}
 DAEMON_USER=${SYS_NAME}
@@ -26,6 +26,8 @@ DAEMON_GROUP=${SYS_NAME}
 LOCK_DIR=/var/lock/${SYS_NAME}
 PID_DIR=/var/run/${SYS_NAME}
 PID_FILE=${PID_DIR}/${NAME}.pid
+LOGFILE=/var/log/${SYS_NAME}/${NAME}.log 
+DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf"
 
 [ -x $DAEMON ] || exit 0
 
@@ -36,6 +38,12 @@ done
 
 . /lib/lsb/init-functions
 
+[ -r /etc/default/openstack ] && . /etc/default/openstack
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+[ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
+[ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=$LOGFILE"
+
 do_start() {
 	start-stop-daemon --start \
 			--background --quiet \