Set DhcpAgentNotification to be "false" by default

This option is set to true by default in Neutron but it should be
disabled in case when OVN backend is used.
It should be enabled only when "traditional" dhcp agents are used in
Neutron.
As OVN is default Neutron backend in the Tripleo, this patch sets
DhcpAgentNotification option to be False by default and enables it only
when neutron-dhcp-agent is going to be deployed.

Closes-Bug: #1937035
Change-Id: I5f8ad32a9fa888dec6b26c0185f8b506521bd6e3
(cherry picked from commit 79e24494bf)
(cherry picked from commit 8cc6d0bf9d)
Conflicts:
 	environments/undercloud.yaml
This commit is contained in:
Slawek Kaplonski 2021-07-22 12:32:37 +02:00 committed by yatinkarel
parent b63936a41f
commit 4bac4ec953
10 changed files with 16 additions and 2 deletions

View File

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

View File

@ -24,6 +24,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'

View File

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

View File

@ -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:

View File

@ -40,6 +40,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

View File

@ -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

View File

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

View File

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

View File

@ -103,6 +103,7 @@ parameter_defaults:
NovaCorsAllowedOrigin: '*'
NovaSyncPowerStateInterval: -1
NeutronDhcpAgentsPerNetwork: 2
DhcpAgentNotification: true
HeatConvergenceEngine: true
HeatCorsAllowedOrigin: '*'
HeatMaxNestedStackDepth: 7

View File

@ -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.