x/openstack-resource-agents
Code Issues Proposed changes

heat-engine: fix AMQP check

Browse Source 
On the last commit, I inserted an error with zeromq condition.
This patch fix it.

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-02-17 11:13:26 +01:00
parent 42c4dc36bc
commit 9b9b934a24
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ocf/heat-engine
View File

@ -235,7 +235,6 @@ heat_engine_monitor() {
# Check the connections according to the PID. # Check the connections according to the PID.
# We are sure to hit the heat-engine process and not other heat process with the same connection behavior (for example heat-api) # We are sure to hit the heat-engine process and not other heat process with the same connection behavior (for example heat-api)
if ocf_is_true "$OCF_RESKEY_zeromq"; then
pid=`cat $OCF_RESKEY_pid` pid=`cat $OCF_RESKEY_pid`
engine_amqp_check=`netstat -punt | grep -s "$OCF_RESKEY_amqp_server_port" | grep -s "$pid" | grep -qs "ESTABLISHED"` engine_amqp_check=`netstat -punt | grep -s "$OCF_RESKEY_amqp_server_port" | grep -s "$pid" | grep -qs "ESTABLISHED"`
rc_amqp=$? rc_amqp=$?
@ -243,7 +242,6 @@ heat_engine_monitor() {
ocf_log err "Heat Engine is not connected to the AMQP server: AMQP connection test returned $rc_amqp" ocf_log err "Heat Engine is not connected to the AMQP server: AMQP connection test returned $rc_amqp"
return $OCF_NOT_RUNNING return $OCF_NOT_RUNNING
fi fi
fi
ocf_log debug "OpenStack Orchestration Engine (heat-engine) monitor succeeded" ocf_log debug "OpenStack Orchestration Engine (heat-engine) monitor succeeded"
return $OCF_SUCCESS return $OCF_SUCCESS