Skip to content

Commit

Permalink
Merge pull request openstack-k8s-operators#432 from slawqo/remove-vxl…
Browse files Browse the repository at this point in the history
…an-from-default-config

Remove vxlan config bits from the default configuration
  • Loading branch information
openshift-merge-bot[bot] authored Oct 28, 2024
2 parents fb87fd9 + ae3a28f commit 0bd44d6
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions templates/neutronapi/config/01-neutron.conf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ mysql_wsrep_sync_wait = 1
{{ if eq .CorePlugin "ml2" }}
[ml2]
mechanism_drivers = {{ .Ml2MechanismDrivers }}
type_drivers = local,flat,vlan,geneve,vxlan
type_drivers = local,flat,vlan,geneve
tenant_network_types = geneve
extension_drivers = qos,port_security,dns_domain_ports

Expand All @@ -33,9 +33,6 @@ max_header_size = 38
[ml2_type_vlan]
network_vlan_ranges = datacentre

[ml2_type_vxlan]
vni_ranges = 1:65536

{{ if .IsOVN }}
[ovn]
ovn_nb_connection = {{ .NBConnection }}
Expand Down

0 comments on commit 0bd44d6

Please sign in to comment.