Change log files names

diff --git a/debian/neutron-plugin-openvswitch-agent.upstart b/debian/neutron-plugin-openvswitch-agent.upstart
index 4cc3ebec721933817ea90133c3ab19fb19540800..b87adac580ec73f74ca6dd3aa517b009c2633ec3 100644 (file)
--- a/debian/neutron-plugin-openvswitch-agent.upstart
+++ b/debian/neutron-plugin-openvswitch-agent.upstart
@@ -14,4 +14,4 @@ pre-start script
   chown neutron:root /var/run/neutron
 end script
 
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/openvswitch-agent.log
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/ovs-agent.log

diff --git a/rpm/SOURCES/neutron-dhcp-agent.init b/rpm/SOURCES/neutron-dhcp-agent.init
index ef93ac2f59a9b44ab9ccb43976f37296f572703d..5b35ea064008bf909466deb82012925f0df18acd 100644 (file)
--- a/rpm/SOURCES/neutron-dhcp-agent.init
+++ b/rpm/SOURCES/neutron-dhcp-agent.init
@@ -18,6 +18,7 @@ configs=(
     "/etc/$proj/dhcp_agent.ini" \
 )
 pidfile="/var/run/$proj/$prog.pid"
+logfile="/var/log/$proj/dhcp-agent.log"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -29,7 +30,7 @@ start() {
         [ -f $config ] || exit 6
     done
     echo -n $"Starting $prog: "
-    daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+    daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

diff --git a/rpm/SOURCES/neutron-l3-agent.init b/rpm/SOURCES/neutron-l3-agent.init
index 0e241f84cf5db82c428eee69c0cfd1e64ecc544f..cceeb6d2c49c61960d2fb29a5cd8b59cd271e36a 100644 (file)
--- a/rpm/SOURCES/neutron-l3-agent.init
+++ b/rpm/SOURCES/neutron-l3-agent.init
@@ -18,6 +18,7 @@ configs=(
     "/etc/$proj/l3_agent.ini" \
 )
 pidfile="/var/run/$proj/$prog.pid"
+logfile="/var/log/$proj/l3-agent.log"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -29,7 +30,7 @@ start() {
         [ -f $config ] || exit 6
     done
     echo -n $"Starting $prog: "
-    daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+    daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

diff --git a/rpm/SOURCES/neutron-metadata-agent.init b/rpm/SOURCES/neutron-metadata-agent.init
index 4a0384dea79dcddcea69f3ba6c1d041e1abffb9c..b895086202ec86c8de9489249db954b897029545 100644 (file)
--- a/rpm/SOURCES/neutron-metadata-agent.init
+++ b/rpm/SOURCES/neutron-metadata-agent.init
@@ -18,6 +18,7 @@ configs=(
     "/etc/$proj/metadata_agent.ini" \
 )
 pidfile="/var/run/$proj/$prog.pid"
+logfile="/var/log/$proj/metadata-agent.log"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -29,7 +30,7 @@ start() {
         [ -f $config ] || exit 6
     done
     echo -n $"Starting $prog: "
-    daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+    daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

diff --git a/rpm/SOURCES/neutron-openvswitch-agent.init b/rpm/SOURCES/neutron-openvswitch-agent.init
index 14e53a9cb4b233772c9a2ef930ac7daba4ac2b03..6aa5dc7f131a8bffb03c5a413bbd2cc12972e3ce 100644 (file)
--- a/rpm/SOURCES/neutron-openvswitch-agent.init
+++ b/rpm/SOURCES/neutron-openvswitch-agent.init
@@ -18,6 +18,7 @@ configs=(
     "/etc/$proj/plugins/openvswitch/ovs_neutron_plugin.ini" \
 )
 pidfile="/var/run/$proj/$prog.pid"
+logfile="/var/log/$proj/ovs-agent.log"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -29,7 +30,7 @@ start() {
         [ -f $config ] || exit 6
     done
     echo -n $"Starting $prog: "
-    daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+    daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile