Patch dhcp agent to avoid unwanted rescheduling

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-ha / openstack_compute.yml

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 93acf13..2375ef5 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute.yml
@@ -7,7 +7,6 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.mirror.v1.openstack
   - system.glusterfs.client.cluster
   - system.nova.compute.cluster
   - system.nova.compute.nfv.hugepages
@@ -17,6 +16,7 @@ classes:
   - system.ceilometer.agent.cluster
   - system.ceilometer.agent.polling.default
   - service.barbican.client.cluster
+  - cluster.all-mcp-arch-common.backports
   - cluster.mcp-common-ha.glusterfs_repo
   - cluster.mcp-common-ha.openstack_compute_pdf
   - cluster.all-mcp-arch-common.opnfv.maas_proxy
@@ -68,14 +68,30 @@ parameters:
         boot_options:
           - spectre_v2=off
           - nopti
+          - 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
       root_helper_daemon: false
+      dhcp_lease_duration: 3600
+      report_interval: 120
   nova:
     compute:
       disk_cachemodes: file=directsync,block=none
       preallocate_images: space
+      heal_instance_info_cache_interval: 300
       barbican:
         enabled: ${_param:barbican_integration_enabled}
       image: