Fixed version of oslo.rootwrap

[openstack-build/ceilometer-build.git] / trusty / debian / ceilometer-collector.init

diff --git a/trusty/debian/ceilometer-collector.init b/trusty/debian/ceilometer-collector.init
index d584ffc746f04337b3ee11839e7f89baaef777a8..205bf42f5fe2249250cc5df3d6082d52072f37b2 100644 (file)
--- a/trusty/debian/ceilometer-collector.init
+++ b/trusty/debian/ceilometer-collector.init
@@ -27,7 +27,7 @@ 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 --log-file=$LOGFILE"
+DAEMON_ARGS="--config-file=/etc/${SYS_NAME}/ceilometer.conf"
 
 [ -x $DAEMON ] || exit 0
 
@@ -38,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 \