diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-04-23 14:42:07 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2019-04-25 14:11:41 +0400 |
| commit | 7522bdb0e898144da2b6dc361dbdd549b39bc025 (patch) | |
| tree | 3c76c95db870cbc69960434acc7a95ee2049c6ca /mcp/reclass/classes | |
| parent | 07d70f192a8d296ad9a94b992d6d6f41191e290b (diff) | |
Patch dhcp agent to avoid unwanted rescheduling
Change-Id: Id49f26a2615e2fc06e94eeaf2e9200e83625e6c9
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/classes')
4 files changed, 22 insertions, 6 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 85e69b666..2375ef54e 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml @@ -71,6 +71,16 @@ 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 5100add1f..fef8d4865 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_gateway.yml @@ -20,3 +20,15 @@ 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) diff --git a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 index 63eb6e250..25fc82624 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-dpdk-noha/openstack/compute.yml.j2 @@ -16,8 +16,6 @@ classes: parameters: neutron: compute: - dhcp_agent_enabled: true - metadata_agent_enabled: true backend: tenant_network_types: ${_param:neutron_tenant_network_types} linux: diff --git a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 index 54835ac4f..2707c7f5e 100644 --- a/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-ovs-noha/openstack/compute.yml.j2 @@ -15,10 +15,6 @@ classes: - cluster.mcp-common-noha.openstack_compute - cluster.mcp-ovs-noha parameters: - neutron: - compute: - dhcp_agent_enabled: true - metadata_agent_enabled: true linux: network: interface: |