x/openstack-resource-agents
Code Issues Proposed changes

Some variables fix

Browse Source
This commit is contained in:
Leseb 2012-09-21 11:46:44 +03:00
parent 464b8ed905
commit 5e50638a4b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ocf/cinder-volume
View File

@ -192,9 +192,6 @@ nova_volume_status() {
nova_volume_monitor() { nova_volume_monitor() {
local rc local rc
local pid local pid
local rc_db
local rc_amqp
local volume_db_check
local volume_amqp_check local volume_amqp_check
nova_volume_status nova_volume_status
@ -211,9 +208,9 @@ nova_volume_monitor() {
pid=`cat $OCF_RESKEY_pid` pid=`cat $OCF_RESKEY_pid`
# check the connections according to the PID # check the connections according to the PID
volume_amqp_check=`netstat -punt | grep -s "$OCF_RESKEY_amqp_server_port" | grep -s "$pid" | grep -qs "ESTABLISHED"` volume_amqp_check=`netstat -punt | grep -s "$OCF_RESKEY_amqp_server_port" | grep -s "$pid" | grep -qs "ESTABLISHED"`
rc_amqp=$? rc=$?
if [ $rc_amqp -ne 0 ]; then if [ $rc -ne 0 ]; then
ocf_log err "Nova Volume is not connected to the AMQP server: AMQP connection test returned $rc_amqp" ocf_log err "Nova Volume is not connected to the AMQP server: $rc"
return $OCF_NOT_RUNNING return $OCF_NOT_RUNNING
fi fi