openstack/sunbeam-charms
Code Issues Proposed changes

[neutron-k8s] change network drivers to geneve,vlan,flat

Browse Source 
Change network type drivers to geneve, vlan and flat.
Change tenant_network_types to the same values.
Remove tunnel_types from ml2_conf.ini
Set vni_range to 1 - 65535

Change-Id: I1d3dad9758d36be9e89f4e15e45f72b4d8edd352
This commit is contained in:
Hemanth Nakkina
2024-05-07 09:02:09 +05:30
parent ebd5cd1b7b
commit 44c4bf300f
3 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
charms/neutron-k8s/config.yaml
View File

@@ -53,7 +53,7 @@ options:
MTU of the underlying physical network. Neutron uses this value to MTU of the underlying physical network. Neutron uses this value to
calculate MTU for all virtual network components. For flat and calculate MTU for all virtual network components. For flat and
VLAN networks, neutron uses this value without modification. For VLAN networks, neutron uses this value without modification. For
overlay networks such as VXLAN, neutron automatically subtracts overlay networks such as Geneve, neutron automatically subtracts
the overlay protocol overhead from this value. the overlay protocol overhead from this value.
path-mtu: path-mtu:
type: int type: int

13
charms/neutron-k8s/src/charm.py
View File

@@ -352,15 +352,18 @@ class OVNContext(sunbeam_ctxts.ConfigContext):
"""Configuration context.""" """Configuration context."""
return { return {
"extension_drivers": "port_security,qos,dns_domain_ports,port_forwarding,uplink_status_propagation", "extension_drivers": "port_security,qos,dns_domain_ports,port_forwarding,uplink_status_propagation",
"type_drivers": "geneve,gre,vlan,flat,local", "type_drivers": "geneve,vlan,flat",
"tenant_network_types": "geneve,gre,vlan,flat,local", "tenant_network_types": "geneve,vlan,flat",
"mechanism_drivers": "ovn", "mechanism_drivers": "ovn",
"tunnel_id_ranges": "1:1000", # Limiting defaults to 2**16 -1 even though geneve vni max is 2**24-1
"vni_ranges": "1001:2000", # ml2_geneve_allocations will be populated with each vni range
# which will result in db timeouts if range is 1 - 2**24-1
# https://opendev.org/openstack/neutron/src/commit/ac1472c8cffe64d32a012c73227595f2f7806de9/neutron/plugins/ml2/drivers/type_tunnel.py#L219-L223
# This means compute nodes can scale upto 65536
"vni_ranges": "1:65535",
"flat_networks": "physnet1", "flat_networks": "physnet1",
"enable_tunneling": "True", "enable_tunneling": "True",
"local_ip": "127.0.0.1", "local_ip": "127.0.0.1",
"tunnel_types": "gre",
"enable_security_group": "True", "enable_security_group": "True",
"max_header_size": "38", "max_header_size": "38",
"ovn_l3_scheduler": "leastloaded", "ovn_l3_scheduler": "leastloaded",

16
charms/neutron-k8s/src/templates/ml2_conf.ini.j2
View File

@@ -13,12 +13,6 @@ path_mtu = {{ options.path_mtu }}
physical_network_mtus = {{ options.physical_network_mtus.split(' ') | join(',') }} physical_network_mtus = {{ options.physical_network_mtus.split(' ') | join(',') }}
{% endif %} {% endif %}
[ml2_type_gre]
tunnel_id_ranges = {{ ovn.tunnel_id_ranges }}
[ml2_type_vxlan]
vni_ranges = {{ ovn.vni_ranges }}
[ml2_type_vlan] [ml2_type_vlan]
network_vlan_ranges = {{ options.vlan_ranges.split(' ') | join(',') }} network_vlan_ranges = {{ options.vlan_ranges.split(' ') | join(',') }}
@@ -26,16 +20,14 @@ network_vlan_ranges = {{ options.vlan_ranges.split(' ') | join(',') }}
flat_networks = {{ ovn.flat_networks }} flat_networks = {{ ovn.flat_networks }}
[ml2_type_geneve] [ml2_type_geneve]
vni_ranges = 1:16777215 vni_ranges = {{ ovn.vni_ranges }}
max_header_size = {{ ovn.max_header_size }}
[ovs] [ovs]
enable_tunneling = {{ ovn.enable_tunneling }} enable_tunneling = {{ ovn.enable_tunneling }}
igmp_snooping_enable = {{ options.enable_igmp_snooping }} igmp_snooping_enable = {{ options.enable_igmp_snooping }}
# local_ip = {{ ovn.local_ip }} # local_ip = {{ ovn.local_ip }}
[agent]
tunnel_types = {{ ovn.tunnel_types }}
[securitygroup] [securitygroup]
enable_security_group = {{ ovn.enable_security_group }} enable_security_group = {{ ovn.enable_security_group }}
@@ -56,7 +48,3 @@ dhcp_default_lease_time = {{ ovn.dhcp_default_lease_time }}
ovn_dhcp4_global_options = {{ ovn.ovn_dhcp4_global_options }} ovn_dhcp4_global_options = {{ ovn.ovn_dhcp4_global_options }}
ovn_dhcp6_global_options = {{ ovn.ovn_dhcp6_global_options }} ovn_dhcp6_global_options = {{ ovn.ovn_dhcp6_global_options }}
vhost_sock_dir = {{ ovn.vhost_sock_dir }} vhost_sock_dir = {{ ovn.vhost_sock_dir }}
[ml2_type_geneve]
vni_ranges = {{ ovn.vni_ranges }}
max_header_size = {{ ovn.max_header_size }}