aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-common-ha
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2019-05-29 16:29:26 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2019-05-29 16:31:20 +0400
commit61c1ff928d01e4d18589877c455c57c802cdecc5 (patch)
treedf4ec25c80dfddaf34a457b51b6953df79727987 /mcp/reclass/classes/cluster/mcp-common-ha
parent60bf21d6aedda367c3e017cd74ea8cf602f1fdef (diff)
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>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml10
1 files changed, 0 insertions, 10 deletions
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 2375ef54e..85e69b666 100644
--- 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