From 154f4f35fa91bba90c4e241fa9728cb43d5fa4fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=94=E4=BF=8A?= Date: Sat, 28 Jun 2014 09:35:11 +0800 Subject: [PATCH] Fix the port of amqp check change 9696 to 5672 --- ocf/neutron-agent-l3 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ocf/neutron-agent-l3 b/ocf/neutron-agent-l3 index 47115bd..2131709 100644 --- a/ocf/neutron-agent-l3 +++ b/ocf/neutron-agent-l3 @@ -38,6 +38,7 @@ OCF_RESKEY_plugin_config_default="/etc/neutron/l3_agent.ini" OCF_RESKEY_user_default="neutron" OCF_RESKEY_pid_default="$HA_RSCTMP/$OCF_RESOURCE_INSTANCE.pid" OCF_RESKEY_neutron_server_port_default="9696" +OCF_RESKEY_amqp_server_port_default="5672" : ${OCF_RESKEY_binary=${OCF_RESKEY_binary_default}} : ${OCF_RESKEY_config=${OCF_RESKEY_config_default}} @@ -45,6 +46,7 @@ OCF_RESKEY_neutron_server_port_default="9696" : ${OCF_RESKEY_user=${OCF_RESKEY_user_default}} : ${OCF_RESKEY_pid=${OCF_RESKEY_pid_default}} : ${OCF_RESKEY_neutron_server_port=${OCF_RESKEY_neutron_server_port_default}} +: ${OCF_RESKEY_amqp_server_port=${OCF_RESKEY_amqp_server_port_default}} ####################################################################### @@ -217,7 +219,7 @@ neutron_l3_agent_monitor() { # We are sure to hit the scheduler process and not other Neutron process with the same connection behavior (for example neutron-server) pid=`cat $OCF_RESKEY_pid` # check the connections according to the PID - network_amqp_check=`netstat -punt | grep -s "$OCF_RESKEY_neutron_server_port" | grep -s "$pid" | grep -qs "ESTABLISHED"` + network_amqp_check=`netstat -punt | grep -s "$OCF_RESKEY_amqp_server_port" | grep -s "$pid" | grep -qs "ESTABLISHED"` rc=$? if [ $rc -ne 0 ]; then ocf_log err "Neutron L3 Server is not connected to the Neutron server: $rc"