x/openstack-resource-agents
Code Issues Proposed changes

neutron-ha-tool: do not replicate dhcp

Browse Source 
Neutron already takes care of the HA for dhcp agents. See neutron setting
`dhcp_agents_per_network` in `neutron.conf`. Having the OCF script call dhcp
replication function of neutron-ha-tool would mean that the tool will
try to plug each network to each DHCP agent, which contradicts neutron's
settings.

Change-Id: I87d9f7010092178c1677e14456b5e2606e5830dc
This commit is contained in:
Mate Lakat 2017-05-08 14:31:20 +02:00
parent fe84d75954
commit 08b85da715
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ocf/neutron-ha-tool
View File

@ -6,9 +6,8 @@
# This resource agent wraps the neutron-ha-tool Python script. # This resource agent wraps the neutron-ha-tool Python script.
# It can be used to monitor neutron for the availability of the # It can be used to monitor neutron for the availability of the
# l3-agents and migrate routers away from agents that are # l3-agents and migrate routers away from agents that are
# currently offline. Additionally it makes sure that dns and dhcp # currently offline.
# configuration is synchronized across all dhcp-agents. The # The neutron-ha-tool was originally part of the openstack-network
# neutron-ha-tool was originally part of the openstack-network
# cookbook for Chef. However as of icehouse it got dropped # cookbook for Chef. However as of icehouse it got dropped
# from upstream, and is now maintained here: # from upstream, and is now maintained here:
# #
@ -255,15 +254,6 @@ neutron_ha_tool_start() {
retry="--retry" retry="--retry"
fi 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 ${OCF_RESKEY_binary} --l3-agent-migrate $retry --now $INSECURE
rc=$? rc=$?