x
/
openstack-resource-agents
Code Issues Proposed changes

Merge "neutron-ha-tool: make start action retry"

This commit is contained in:
Jenkins 2016-04-01 19:22:13 +00:00 committed by Gerrit Code Review
parent 75dcff3b9d a0451cbf57
commit 51748eb269
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ocf/neutron-ha-tool
View File

@ -248,7 +248,14 @@ neutron_ha_tool_start() {
INSECURE="--insecure"
fi
${OCF_RESKEY_binary} --replicate-dhcp $INSECURE
# Remain backwards-compatible with older neutron-ha-tool.py which
# don't support --retry.
retry=""
if ${OCF_RESKEY_binary} --help | grep -q -- --retry; then
retry="--retry"
fi
${OCF_RESKEY_binary} --replicate-dhcp $retry $INSECURE
rc=$?
if [ $rc -ne 0 ]; then
@ -257,7 +264,7 @@ neutron_ha_tool_start() {
return $OCF_ERR_GENERIC
fi
${OCF_RESKEY_binary} --l3-agent-migrate --now $INSECURE
${OCF_RESKEY_binary} --l3-agent-migrate $retry --now $INSECURE
rc=$?
if [ $rc -ne 0 ]; then