Allow selecting log destination for Ceilometer daemons

Rewritten-From: cf3bdff2dc4ca35ef1fb8dcd6bb393093ac4a6ec

diff --git a/trusty/debian/ceilometer-agent-central.init b/trusty/debian/ceilometer-agent-central.init
index 3d1985a3f6eacffa9b3bba5152de502f984e13ef..e944f8fa97671bc28db7932cadd3013b69b52c66 100644 (file)
--- a/trusty/debian/ceilometer-agent-central.init
+++ b/trusty/debian/ceilometer-agent-central.init
@@ -26,7 +26,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
 
@@ -37,6 +37,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 \

diff --git a/trusty/debian/ceilometer-agent-central.upstart.in b/trusty/debian/ceilometer-agent-central.upstart.in
index d18092a0bc0722823cf54703e59ec30fa9d16d9b..44319bdc4cf4319871dea9a11f1612dff8ffe7dd 100644 (file)
--- a/trusty/debian/ceilometer-agent-central.upstart.in
+++ b/trusty/debian/ceilometer-agent-central.upstart.in
@@ -14,4 +14,12 @@ pre-start script
        chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-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
+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-agent-central --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script

diff --git a/trusty/debian/ceilometer-agent-compute.init b/trusty/debian/ceilometer-agent-compute.init
index 5b7da4b540dec1b4e12d4170048cf1d1812e2f6d..0b9ef939d7c1b2cffb9356de06b529c6d743cbb8 100644 (file)
--- a/trusty/debian/ceilometer-agent-compute.init
+++ b/trusty/debian/ceilometer-agent-compute.init
@@ -26,7 +26,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
 
@@ -37,6 +37,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 \

diff --git a/trusty/debian/ceilometer-agent-compute.upstart.in b/trusty/debian/ceilometer-agent-compute.upstart.in
index c37f5c89c1acd9b8594ea2ab14a7a37c8db56a7e..de8c2cadcf8283b79763b3d133c098282e47f299 100644 (file)
--- a/trusty/debian/ceilometer-agent-compute.upstart.in
+++ b/trusty/debian/ceilometer-agent-compute.upstart.in
@@ -14,4 +14,12 @@ pre-start script
        chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-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
+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-agent-compute --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script

diff --git a/trusty/debian/ceilometer-agent-notification.init b/trusty/debian/ceilometer-agent-notification.init
index 88cb7f139befeeb818befdbf378dd858857eea0b..876e6e7ea28bb7fba907879eebc63bc830713ae7 100644 (file)
--- a/trusty/debian/ceilometer-agent-notification.init
+++ b/trusty/debian/ceilometer-agent-notification.init
@@ -26,7 +26,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
 
@@ -37,6 +37,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 \

diff --git a/trusty/debian/ceilometer-agent-notification.upstart.in b/trusty/debian/ceilometer-agent-notification.upstart.in
index 22793c636c2629c5c64877eeb76c4ca462659379..22807e46bc60c6464a5202aa94b5ef6e5317a356 100644 (file)
--- a/trusty/debian/ceilometer-agent-notification.upstart.in
+++ b/trusty/debian/ceilometer-agent-notification.upstart.in
@@ -14,4 +14,12 @@ pre-start script
        chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-agent-notification --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-agent-notification.log" 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-agent-notification --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script

diff --git a/trusty/debian/ceilometer-alarm-evaluator.init b/trusty/debian/ceilometer-alarm-evaluator.init
index 39b2031629e52f93c44eafe4763b3a75af6e8729..4aebafbe43eff8f9abf83589dc6dc7d69800654d 100644 (file)
--- a/trusty/debian/ceilometer-alarm-evaluator.init
+++ b/trusty/debian/ceilometer-alarm-evaluator.init
@@ -26,7 +26,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
 
@@ -37,6 +37,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 \

diff --git a/trusty/debian/ceilometer-alarm-evaluator.upstart.in b/trusty/debian/ceilometer-alarm-evaluator.upstart.in
index d41e5651a2b3ca645619ac92341fb41ec061f1df..a5688d7b6a4e60748199662412f11c3197835fbb 100644 (file)
--- a/trusty/debian/ceilometer-alarm-evaluator.upstart.in
+++ b/trusty/debian/ceilometer-alarm-evaluator.upstart.in
@@ -14,4 +14,12 @@ pre-start script
        chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-alarm-evaluator --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-alarm-evaluator.log" 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-alarm-evaluator --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script

diff --git a/trusty/debian/ceilometer-alarm-notifier.init b/trusty/debian/ceilometer-alarm-notifier.init
index 466b96ce471cd1cf1b43e43a80990f91909bb447..8173cc8a70b2ceca4439ce45dba7e40488cb76b7 100644 (file)
--- a/trusty/debian/ceilometer-alarm-notifier.init
+++ b/trusty/debian/ceilometer-alarm-notifier.init
@@ -26,7 +26,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
 
@@ -37,6 +37,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 \

diff --git a/trusty/debian/ceilometer-alarm-notifier.upstart.in b/trusty/debian/ceilometer-alarm-notifier.upstart.in
index 8cf8ba0dc50e904c6c427fe3e10955efc3db81da..b847d8c05059f7b906c2b6ccb35f358ece11631a 100644 (file)
--- a/trusty/debian/ceilometer-alarm-notifier.upstart.in
+++ b/trusty/debian/ceilometer-alarm-notifier.upstart.in
@@ -14,4 +14,12 @@ pre-start script
        chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-alarm-notifier --config-file /etc/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-alarm-notifier.log" 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-alarm-notifier --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script

diff --git a/trusty/debian/ceilometer-api.init b/trusty/debian/ceilometer-api.init
index d5bafc8cb1381ddf7c8c0466295c2c5619c40f78..3aba0aaaa78ca48d6303bd0e69636644c7a4305b 100644 (file)
--- a/trusty/debian/ceilometer-api.init
+++ b/trusty/debian/ceilometer-api.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 \

diff --git a/trusty/debian/ceilometer-api.upstart.in b/trusty/debian/ceilometer-api.upstart.in
index 5e9ff3e6e4ad3f813072a1212c9c5f9434cd1e9e..59df6e6b81950888c736e20cd9fb7146fa3412fe 100644 (file)
--- a/trusty/debian/ceilometer-api.upstart.in
+++ b/trusty/debian/ceilometer-api.upstart.in
@@ -14,4 +14,12 @@ pre-start script
        chown ceilometer:ceilometer /var/lock/ceilometer
 end script
 
-exec su -s /bin/sh -c "exec ceilometer-api --log-file /var/log/ceilometer/ceilometer-api.log --config-file /etc/ceilometer/ceilometer.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-api --config-file /etc/ceilometer/ceilometer.conf $DAEMON_ARGS" ceilometer
+end script

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 \

diff --git a/trusty/debian/ceilometer-collector.upstart.in b/trusty/debian/ceilometer-collector.upstart.in
index 2a60710b6d864b97306c70fe4b74050270261f1a..744bfe61d79e9c52ac6a111ceddb56e5eaa3295f 100644 (file)
--- a/trusty/debian/ceilometer-collector.upstart.in
+++ b/trusty/debian/ceilometer-collector.upstart.in
@@ -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/ceilometer/ceilometer.conf --log-file /var/log/ceilometer/ceilometer-collector.log" 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