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
This commit is contained in:
parent
5670359777
commit
79e24494bf
|
@ -78,6 +78,7 @@ parameter_defaults:
|
|||
NeutronServicePlugins: 'router,qos,segments,trunk'
|
||||
NeutronVniRanges: ['1:4094', ]
|
||||
NeutronEnableDVR: false
|
||||
DhcpAgentNotification: true
|
||||
KernelIpNonLocalBind: 0
|
||||
Debug: true
|
||||
DockerPuppetDebug: True
|
||||
|
|
|
@ -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'
|
||||
|
|
|
@ -22,6 +22,7 @@ parameter_defaults:
|
|||
NeutronMechanismDrivers: ovn,ansible
|
||||
NeutronNetworkType: vlan
|
||||
NeutronTypeDrivers: local,geneve,vlan,flat
|
||||
DhcpAgentNotification: true
|
||||
IronicApiMaxRetries: 180
|
||||
IronicDefaultNetworkInterface: neutron
|
||||
IronicAutomatedClean: false
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -33,6 +33,7 @@ parameter_defaults:
|
|||
NeutronServicePlugins: 'router,qos,segments,trunk,port_forwarding'
|
||||
NeutronVniRanges: ['1:65536', ]
|
||||
KernelIpNonLocalBind: 0
|
||||
DhcpAgentNotification: true
|
||||
|
||||
NeutronL3AgentExtensions: "port_forwarding"
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@ parameter_defaults:
|
|||
NeutronServicePlugins: 'router,qos,segments,trunk,port_forwarding'
|
||||
NeutronVniRanges: ['1:65536', ]
|
||||
KernelIpNonLocalBind: 0
|
||||
DhcpAgentNotification: true
|
||||
|
||||
NeutronEnableDVR: false
|
||||
|
||||
|
|
|
@ -86,6 +86,7 @@ parameter_defaults:
|
|||
NeutronBridgeMappings: ctlplane:br-ctlplane
|
||||
NeutronAgentExtensions: []
|
||||
NeutronFlatNetworks: '*'
|
||||
DhcpAgentNotification: true
|
||||
HeatConvergenceEngine: true
|
||||
HeatCorsAllowedOrigin: '*'
|
||||
HeatMaxNestedStackDepth: 7
|
||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue