Revert "Patch dhcp agent to avoid unwanted resync"

This reverts commit 7522bdb0e898144da2b6dc361dbdd549b39bc025.
The original patch has been merged (https://review.opendev.org/661011)

Change-Id: I9a1c04590145800523d546e36e9462fa7074922c
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 61c1ff928d01e4d18589877c455c57c802cdecc5)

diff --git a/mcp/config/states/neutron_dhcp_agent_patch b/mcp/config/states/neutron_dhcp_agent_patch
deleted file mode 100755 (executable)
index a9e14be..0000000
--- a/mcp/config/states/neutron_dhcp_agent_patch
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash -e
-##############################################################################
-# Copyright (c) 2019 Mirantis Inc., Enea AB and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-# regression due to https://bugs.launchpad.net/neutron/+bug/1760047
-salt -I 'neutron:gateway' pkg.install python-neutron
-salt -I 'neutron:gateway' file.patch /usr/lib/python2.7/dist-packages/neutron/agent/dhcp/agent.py /var/tmp/dhcp_agent.patch || true

diff --git a/mcp/config/states/neutron_gateway b/mcp/config/states/neutron_gateway
index 06f9b77..77b1167 100755 (executable)
--- a/mcp/config/states/neutron_gateway
+++ b/mcp/config/states/neutron_gateway
@@ -9,5 +9,4 @@
 
 CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
 
-$(dirname "${BASH_SOURCE[0]}")/neutron_dhcp_agent_patch
 salt -I 'neutron:gateway' state.sls neutron

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index 7c66704..7cf4008 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -52,7 +52,6 @@ salt -I 'cinder:controller:role:primary' state.sls cinder
 salt -I 'cinder:controller:role:secondary' state.sls cinder
 wait_for 3.0 "salt -I 'cinder:volume' state.sls cinder"
 
-$(dirname "${BASH_SOURCE[0]}")/neutron_dhcp_agent_patch
 salt -I 'neutron:server:role:primary' state.sls neutron
 salt -I 'neutron:server:role:secondary' state.sls neutron
 salt -I 'neutron:gateway' state.sls neutron.gateway

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
index 2375ef5..85e69b6 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -71,16 +71,6 @@ parameters:
           - nospec_store_bypass_disable
           - noibrs
           - noibpb
-      file:
-        /var/tmp/dhcp_agent.patch:
-          contents: |
-            549,551c549,550
-            <                 self.schedule_resync("Duplicate IP addresses found, "
-            <                                      "DHCP cache is out of sync",
-            <                                      created_port.network_id)
-            ---
-            >                 LOG.info("Duplicate IP addresses found for %s network",
-            >                          created_port.network_id)
   neutron:
     gateway:
       vlan_aware_vms: true

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
index fef8d48..5100add 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml
@@ -20,15 +20,3 @@ parameters:
       root_helper_daemon: false
       dhcp_lease_duration: 3600
       report_interval: 120
-  linux:
-    system:
-      file:
-        /var/tmp/dhcp_agent.patch:
-          contents: |
-            549,551c549,550
-            <                 self.schedule_resync("Duplicate IP addresses found, "
-            <                                      "DHCP cache is out of sync",
-            <                                      created_port.network_id)
-            ---
-            >                 LOG.info("Duplicate IP addresses found for %s network",
-            >                          created_port.network_id)