Merge "Set DhcpAgentNotification to be "false" by default"

ci/environments/scenario007-multinode-containers.yaml

@@ -78,6 +78,7 @@ parameter_defaults:
   NeutronServicePlugins: 'router,qos,segments,trunk'
   NeutronVniRanges: ['1:4094', ]
   NeutronEnableDVR: false
+  DhcpAgentNotification: true
   KernelIpNonLocalBind: 0
   Debug: true
   DockerPuppetDebug: True

ci/environments/scenario007-standalone.yaml

@@ -22,6 +22,7 @@ resource_registry:
   OS::TripleO::Services::SwiftStorage: OS::Heat::None
   OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
 parameter_defaults:
+  DhcpAgentNotification: true
   NeutronMechanismDrivers: ['openvswitch']
   NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
   NeutronNetworkType: 'vxlan'

ci/environments/scenario012-standalone.yaml

@@ -22,6 +22,7 @@ parameter_defaults:
   NeutronMechanismDrivers: ovn,ansible
   NeutronNetworkType: vlan
   NeutronTypeDrivers: local,geneve,vlan,flat
+  DhcpAgentNotification: true
   IronicApiMaxRetries: 180
   IronicDefaultNetworkInterface: neutron
   IronicAutomatedClean: false

deployment/neutron/neutron-base.yaml

@@ -13,7 +13,7 @@ parameters:
     default: 0
     description: The number of neutron dhcp agents to schedule per network
   DhcpAgentNotification:
-    default: true
+    default: false
     description: Whether or not to enable DHCP agent notifications.
     type: boolean
   NeutronDnsDomain:

environments/neutron-ovs-dvr.yaml

@@ -39,6 +39,7 @@ parameter_defaults:
   NeutronServicePlugins: 'router,qos,segments,trunk'
   NeutronVniRanges: ['1:4094', ]
   KernelIpNonLocalBind: 0
+  DhcpAgentNotification: true
 
   # Setting NeutronEnableDVR enables distributed routing support in the
   # ML2 plugin and agents that support this feature

environments/services/ironic-overcloud.yaml

@@ -1,5 +1,6 @@
 parameter_defaults:
   NeutronMechanismDrivers: ['ovn', 'baremetal']
+  DhcpAgentNotification: true
 
 resource_registry:
   OS::TripleO::Services::IronicApi: ../../deployment/ironic/ironic-api-container-puppet.yaml
@@ -7,4 +8,4 @@ resource_registry:
   OS::TripleO::Services::IronicPxe: ../../deployment/ironic/ironic-pxe-container-puppet.yaml
   OS::TripleO::Services::NovaIronic: ../../deployment/nova/nova-ironic-container-puppet.yaml
   OS::TripleO::Services::IronicNeutronAgent: ../../deployment/ironic/ironic-neutron-agent-container-puppet.yaml
-  OS::TripleO::Services::NeutronDhcpAgent: ../../deployment/neutron/neutron-dhcp-container-puppet.yaml
+  OS::TripleO::Services::NeutronDhcpAgent: ../../deployment/neutron/neutron-dhcp-container-puppet.yaml

environments/services/neutron-ovs-dvr.yaml

@@ -33,6 +33,7 @@ parameter_defaults:
   NeutronServicePlugins: 'router,qos,segments,trunk,port_forwarding'
   NeutronVniRanges: ['1:65536', ]
   KernelIpNonLocalBind: 0
+  DhcpAgentNotification: true
 
   NeutronL3AgentExtensions: "port_forwarding"
 

environments/services/neutron-ovs.yaml

@@ -25,6 +25,7 @@ parameter_defaults:
   NeutronServicePlugins: 'router,qos,segments,trunk,port_forwarding'
   NeutronVniRanges: ['1:65536', ]
   KernelIpNonLocalBind: 0
+  DhcpAgentNotification: true
 
   NeutronEnableDVR: false
 

environments/undercloud.yaml

@@ -86,6 +86,7 @@ parameter_defaults:
   NeutronBridgeMappings: ctlplane:br-ctlplane
   NeutronAgentExtensions: []
   NeutronFlatNetworks: '*'
+  DhcpAgentNotification: true
   HeatConvergenceEngine: true
   HeatCorsAllowedOrigin: '*'
   HeatMaxNestedStackDepth: 7

releasenotes/notes/set-DhcpAgentNotification-to-be-false-by-default-4fe7acaa60d2a95f.yaml

@@ -0,0 +1,6 @@
+---
+other:
+  - |
+    Parameter ``DhcpAgentNotification`` is set to ``False`` by default now. It
+    should be set to ``True`` in case when Neutron DHCP agent is going to be
+    deployed.  It shouldn't be enabled with ML2/OVN backend.