From 08b85da7159b1d12007dae24147bfeec451a3953 Mon Sep 17 00:00:00 2001
From: Mate Lakat <mlakat@suse.com>
Date: Mon, 8 May 2017 14:31:20 +0200
Subject: [PATCH] neutron-ha-tool: do not replicate dhcp

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
---
 ocf/neutron-ha-tool | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/ocf/neutron-ha-tool b/ocf/neutron-ha-tool
index fc6a31c..cb213ab 100644
--- a/ocf/neutron-ha-tool
+++ b/ocf/neutron-ha-tool
@@ -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=$?