diff --git a/ocf/neutron-ha-tool b/ocf/neutron-ha-tool index 5e40bf2..b4c8d8c 100644 --- a/ocf/neutron-ha-tool +++ b/ocf/neutron-ha-tool @@ -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