diff options
author | Amy Fong <amy.fong@windriver.com> | 2014-03-28 13:56:02 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-03-28 14:39:30 -0400 |
commit | 984c2d69f51824a4c1e7b3a448fe24759e594026 (patch) | |
tree | 43217944da7ae820af7e9ccfcd775cc72597d679 /meta-openstack | |
parent | d6e8ddfcca4c0c61643bca5e33113b414077306a (diff) | |
download | meta-cloud-services-984c2d69f51824a4c1e7b3a448fe24759e594026.tar.gz |
OpenStack: sysvinit scripts - enable logging
Explicitly enable --log-dir to enable logging where available
Signed-off-by: Amy Fong <amy.fong@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
10 files changed, 45 insertions, 14 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init index 23ca780..d3c72e4 100644 --- a/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init +++ b/meta-openstack/recipes-devtools/python/python-ceilometer/ceilometer.init | |||
@@ -37,7 +37,7 @@ start() | |||
37 | 37 | ||
38 | start-stop-daemon --start --quiet --background \ | 38 | start-stop-daemon --start --quiet --background \ |
39 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ | 39 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ |
40 | -- --config-file $CONFIG | 40 | -- --config-file $CONFIG --log-dir=/var/log/ceilometer |
41 | 41 | ||
42 | if [ $? -eq 0 ]; then | 42 | if [ $? -eq 0 ]; then |
43 | echo "done." | 43 | echo "done." |
diff --git a/meta-openstack/recipes-devtools/python/python-cinder/cinder.init b/meta-openstack/recipes-devtools/python/python-cinder/cinder.init index 0a3923a..ecf9d66 100644 --- a/meta-openstack/recipes-devtools/python/python-cinder/cinder.init +++ b/meta-openstack/recipes-devtools/python/python-cinder/cinder.init | |||
@@ -30,10 +30,15 @@ start() | |||
30 | fi | 30 | fi |
31 | fi | 31 | fi |
32 | 32 | ||
33 | if [ ! -d /var/log/cinder ]; then | ||
34 | mkdir /var/log/cinder | ||
35 | fi | ||
36 | |||
33 | echo -n "Starting $DESC..." | 37 | echo -n "Starting $DESC..." |
34 | 38 | ||
35 | start-stop-daemon --start --quiet --background \ | 39 | start-stop-daemon --start --quiet --background \ |
36 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} | 40 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ |
41 | -- --log-dir=/var/log/cinder | ||
37 | 42 | ||
38 | if [ $? -eq 0 ]; then | 43 | if [ $? -eq 0 ]; then |
39 | echo "done." | 44 | echo "done." |
diff --git a/meta-openstack/recipes-devtools/python/python-glance/glance.init b/meta-openstack/recipes-devtools/python/python-glance/glance.init index def500f..cb94ed7 100644 --- a/meta-openstack/recipes-devtools/python/python-glance/glance.init +++ b/meta-openstack/recipes-devtools/python/python-glance/glance.init | |||
@@ -37,7 +37,7 @@ start() | |||
37 | 37 | ||
38 | start-stop-daemon --start --quiet --background \ | 38 | start-stop-daemon --start --quiet --background \ |
39 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ | 39 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ |
40 | -- --config-file $CONFIG | 40 | -- --config-file $CONFIG --log-dir=/var/log/glance |
41 | 41 | ||
42 | if [ $? -eq 0 ]; then | 42 | if [ $? -eq 0 ]; then |
43 | echo "done." | 43 | echo "done." |
diff --git a/meta-openstack/recipes-devtools/python/python-heat/heat.init b/meta-openstack/recipes-devtools/python/python-heat/heat.init index e37c4c8..4d8c180 100644 --- a/meta-openstack/recipes-devtools/python/python-heat/heat.init +++ b/meta-openstack/recipes-devtools/python/python-heat/heat.init | |||
@@ -43,7 +43,7 @@ start() | |||
43 | 43 | ||
44 | start-stop-daemon --start --quiet --background \ | 44 | start-stop-daemon --start --quiet --background \ |
45 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ | 45 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ |
46 | -- --config-file $CONFIG | 46 | -- --config-file $CONFIG --log-dir=/var/log/heat |
47 | 47 | ||
48 | if [ $? -eq 0 ]; then | 48 | if [ $? -eq 0 ]; then |
49 | echo "done." | 49 | echo "done." |
diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone b/meta-openstack/recipes-devtools/python/python-keystone/keystone index 463b05f..d73bc75 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone/keystone +++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone | |||
@@ -27,10 +27,14 @@ start () | |||
27 | fi | 27 | fi |
28 | fi | 28 | fi |
29 | 29 | ||
30 | if [ ! -d /var/log/keystone ]; then | ||
31 | mkdir /var/log/keystone | ||
32 | fi | ||
30 | echo -n "Starting $DESC..." | 33 | echo -n "Starting $DESC..." |
31 | 34 | ||
32 | start-stop-daemon --start --quiet --background \ | 35 | start-stop-daemon --start --quiet --background \ |
33 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} | 36 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ |
37 | -- --log-dir=/var/log/keystone | ||
34 | 38 | ||
35 | if [ $? -eq 0 ]; then | 39 | if [ $? -eq 0 ]; then |
36 | echo "done." | 40 | echo "done." |
diff --git a/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init b/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init index e02ea9e..01cb27e 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init +++ b/meta-openstack/recipes-devtools/python/python-neutron/neutron-agent.init | |||
@@ -26,10 +26,15 @@ start() | |||
26 | fi | 26 | fi |
27 | fi | 27 | fi |
28 | 28 | ||
29 | if [ ! -d /var/log/neutron ]; then | ||
30 | mkdir -p /var/log/neutron | ||
31 | fi | ||
32 | |||
29 | echo -n "Starting $DESC..." | 33 | echo -n "Starting $DESC..." |
30 | 34 | ||
31 | start-stop-daemon --start --quiet --background \ | 35 | start-stop-daemon --start --quiet --background \ |
32 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} | 36 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ |
37 | -- --log-dir=/var/log/neutron | ||
33 | 38 | ||
34 | if [ $? -eq 0 ]; then | 39 | if [ $? -eq 0 ]; then |
35 | echo "done." | 40 | echo "done." |
diff --git a/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init b/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init index bd1fe86..63440e8 100644 --- a/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init +++ b/meta-openstack/recipes-devtools/python/python-neutron/neutron-server.init | |||
@@ -13,7 +13,9 @@ | |||
13 | DESC="neutron-server" | 13 | DESC="neutron-server" |
14 | DAEMON="/usr/bin/neutron-server" | 14 | DAEMON="/usr/bin/neutron-server" |
15 | PIDFILE="/var/run/neutron-server.pid" | 15 | PIDFILE="/var/run/neutron-server.pid" |
16 | DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=@plugin@" | 16 | DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf \ |
17 | --config-file=@plugin@ \ | ||
18 | --log-dir=/var/log/neutron" | ||
17 | 19 | ||
18 | start() | 20 | start() |
19 | { | 21 | { |
@@ -28,6 +30,10 @@ start() | |||
28 | fi | 30 | fi |
29 | fi | 31 | fi |
30 | 32 | ||
33 | if [ ! -d /var/log/neutron ]; then | ||
34 | mkdir /var/log/neutron | ||
35 | fi | ||
36 | |||
31 | echo -n "Starting $DESC..." | 37 | echo -n "Starting $DESC..." |
32 | 38 | ||
33 | start-stop-daemon --start --quiet --background \ | 39 | start-stop-daemon --start --quiet --background \ |
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-all b/meta-openstack/recipes-devtools/python/python-nova/nova-all index b3ff40e..c1d537d 100644 --- a/meta-openstack/recipes-devtools/python/python-nova/nova-all +++ b/meta-openstack/recipes-devtools/python/python-nova/nova-all | |||
@@ -29,10 +29,15 @@ start () | |||
29 | fi | 29 | fi |
30 | fi | 30 | fi |
31 | 31 | ||
32 | if [ ! -d /var/log/nova ]; then | ||
33 | mkdir /var/log/nova | ||
34 | fi | ||
35 | |||
32 | echo -n "Starting $DESC..." | 36 | echo -n "Starting $DESC..." |
33 | 37 | ||
34 | start-stop-daemon --start --quiet --background \ | 38 | start-stop-daemon --start --quiet --background \ |
35 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} | 39 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ |
40 | -- --log-dir=/var/log/nova | ||
36 | 41 | ||
37 | if [ $? -eq 0 ]; then | 42 | if [ $? -eq 0 ]; then |
38 | echo "done." | 43 | echo "done." |
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth b/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth index 59c6cee..99f04d5 100644 --- a/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth +++ b/meta-openstack/recipes-devtools/python/python-nova/nova-consoleauth | |||
@@ -16,7 +16,7 @@ | |||
16 | set -e | 16 | set -e |
17 | 17 | ||
18 | DAEMON=/usr/bin/nova-consoleauth | 18 | DAEMON=/usr/bin/nova-consoleauth |
19 | DAEMON_ARGS="" | 19 | DAEMON_ARGS="--log-dir=/var/log/nova " |
20 | PIDFILE=/var/run/nova/nova-consoleauth.pid | 20 | PIDFILE=/var/run/nova/nova-consoleauth.pid |
21 | 21 | ||
22 | ENABLED=true | 22 | ENABLED=true |
@@ -76,9 +76,12 @@ case "$1" in | |||
76 | chown nova $PIDDIR | 76 | chown nova $PIDDIR |
77 | fi | 77 | fi |
78 | 78 | ||
79 | if [ ! -d /var/log/nova ]; then | ||
80 | mkdir /var/log/nova | ||
81 | fi | ||
82 | |||
79 | echo "Starting nova console" "nova-consoleauth" | 83 | echo "Starting nova console" "nova-consoleauth" |
80 | sudo -u nova \ | 84 | start-stop-daemon --start -b -m --pidfile $PIDFILE \ |
81 | start-stop-daemon --start -b -m --pidfile $PIDFILE \ | ||
82 | --exec ${DAEMON} -- ${DAEMON_ARGS} | 85 | --exec ${DAEMON} -- ${DAEMON_ARGS} |
83 | log_end_msg $? | 86 | log_end_msg $? |
84 | ;; | 87 | ;; |
diff --git a/meta-openstack/recipes-devtools/python/python-nova/nova.init b/meta-openstack/recipes-devtools/python/python-nova/nova.init index 5917882..87e72fa 100644 --- a/meta-openstack/recipes-devtools/python/python-nova/nova.init +++ b/meta-openstack/recipes-devtools/python/python-nova/nova.init | |||
@@ -46,11 +46,14 @@ start () | |||
46 | mkdir -p $PIDDIR | 46 | mkdir -p $PIDDIR |
47 | chown nova $PIDDIR | 47 | chown nova $PIDDIR |
48 | fi | 48 | fi |
49 | if [ ! -d /var/log/nova ]; then | ||
50 | mkdir /var/log/nova | ||
51 | fi | ||
49 | echo -n "Starting $DESC..." | 52 | echo -n "Starting $DESC..." |
50 | 53 | ||
51 | sudo -u nova \ | 54 | start-stop-daemon --start --quiet --background \ |
52 | start-stop-daemon --start --quiet --background \ | 55 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} \ |
53 | --pidfile ${PIDFILE} --make-pidfile --exec ${DAEMON} | 56 | -- --log-dir=/var/log/nova |
54 | 57 | ||
55 | if [ $? -eq 0 ]; then | 58 | if [ $? -eq 0 ]; then |
56 | echo "done." | 59 | echo "done." |