Merge "neutron-ha-tool: do not replicate dhcp"

This commit is contained in:
Zuul 2018-01-16 13:53:18 +00:00 committed by Gerrit Code Review
commit a655cffbc3
1 changed files with 2 additions and 12 deletions

View File

@ -6,9 +6,8 @@
# This resource agent wraps the neutron-ha-tool Python script.
# It can be used to monitor neutron for the availability of the
# l3-agents and migrate routers away from agents that are
# currently offline. Additionally it makes sure that dns and dhcp
# configuration is synchronized across all dhcp-agents. The
# neutron-ha-tool was originally part of the openstack-network
# currently offline.
# The neutron-ha-tool was originally part of the openstack-network
# cookbook for Chef. However as of icehouse it got dropped
# from upstream, and is now maintained here:
#
@ -255,15 +254,6 @@ neutron_ha_tool_start() {
retry="--retry"
fi
${OCF_RESKEY_binary} --replicate-dhcp $retry $INSECURE
rc=$?
if [ $rc -ne 0 ]; then
ocf_log err "Neutron HA Tool failed to replicate networks to DHCP" \
"agents."
return $OCF_ERR_GENERIC
fi
${OCF_RESKEY_binary} --l3-agent-migrate $retry --now $INSECURE
rc=$?