diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-05-31 07:13:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-05-31 07:13:26 +0000 |
| commit | a7e9257bbfd20739069272e89bc50f5ba6dba831 (patch) | |
| tree | 7e6b38c1cadb0d8b9fa6581285af0fdc42444795 /mcp/reclass/classes/cluster | |
| parent | 430a0aee9e8c7400d698f460406152aa70349b6c (diff) | |
| parent | 61c1ff928d01e4d18589877c455c57c802cdecc5 (diff) | |
Merge "Revert "Patch dhcp agent to avoid unwanted resync""
Diffstat (limited to 'mcp/reclass/classes/cluster')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml | 10 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml | 12 |
2 files changed, 0 insertions, 22 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 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 fef8d4865..5100add1f 100644 --- 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) |