openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Neutron: Disable dhcp agent notification when ovn driver is used"

Browse Source
This commit is contained in:
Zuul 2023-02-27 21:02:15 +00:00 committed by Gerrit Code Review
commit 15493c30bf
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/neutron.pp
View File

@ -110,9 +110,12 @@ class openstack_integration::neutron (
} }
if $driver == 'ovn' { if $driver == 'ovn' {
$dhcp_agent_notification = false
$plugins_list = ['qos', 'ovn-router', 'trunk'] $plugins_list = ['qos', 'ovn-router', 'trunk']
$providers_list = undef $providers_list = undef
} else { } else {
$dhcp_agent_notification = true
$bgpvpn_plugin = $bgpvpn_enabled ? { $bgpvpn_plugin = $bgpvpn_enabled ? {
true => 'bgpvpn', true => 'bgpvpn',
default => undef, default => undef,
@ -179,6 +182,7 @@ class openstack_integration::neutron (
notification_topics => $notification_topics, notification_topics => $notification_topics,
notification_driver => 'messagingv2', notification_driver => 'messagingv2',
global_physnet_mtu => $global_physnet_mtu, global_physnet_mtu => $global_physnet_mtu,
dhcp_agent_notification => $dhcp_agent_notification,
} }
class { 'neutron::client': } class { 'neutron::client': }
class { 'neutron::keystone::authtoken': class { 'neutron::keystone::authtoken':