openstack/charm-neutron-gateway
Code Issues Proposed changes

Fix cleanup.

Browse Source
This commit is contained in:
Hui Xiang 2014-12-16 09:06:26 +08:00
parent 990bba1a5c
commit 291554610d
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/ns_ovs_cleanup.sh
View File

@ -11,10 +11,6 @@ logger "CRM_notify_node: $CRM_notify_node"
logger " ** " logger " ** "
set -x set -x
CRM_notify_task="stop"
CRM_notify_desc="OK"
CRM_notify_rsc="res_PingCheck"
DEFAULT_PIDFILE="/tmp/monitor.pid" DEFAULT_PIDFILE="/tmp/monitor.pid"
function check_pid function check_pid
@ -55,7 +51,7 @@ if [[ $CRM_notify_rsc == 'res_PingCheck' && ${CRM_notify_task} == 'start' ]]; th
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
logger "Executing monitor to reschedule Neutron agents..." logger "Executing monitor to reschedule Neutron agents..."
#sudo python /usr/local/bin/monitor.py >> /dev/null 2>&1 & echo $! > $DEFAULT_PIDFILE #sudo python /usr/local/bin/monitor.py >> /dev/null 2>&1 & echo $! > $DEFAULT_PIDFILE
sudo python monitor.py >> /dev/null 2>&1 & echo $! sudo python /usr/local/bin/monitor.py >> /dev/null 2>&1 & echo $!
sleep 3 sleep 3
pid=`ps -aux | grep m\[o\]nitor.py | awk -F' ' '{print $2}'` pid=`ps -aux | grep m\[o\]nitor.py | awk -F' ' '{print $2}'`
if [ ! -z "$pid" ]; then if [ ! -z "$pid" ]; then