Browse Source

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
Mate Lakat 1 year ago
parent
commit
08b85da715
1 changed files with 2 additions and 12 deletions
  1. 2
    12
      ocf/neutron-ha-tool

+ 2
- 12
ocf/neutron-ha-tool View File

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

Loading…
Cancel
Save