Merge "Revert "Set explicitly_egress_direct=True for ml2 ovs"" into stable/21.10
This commit is contained in:
commit
73a4605a6d
|
@ -1,50 +0,0 @@
|
||||||
# queens
|
|
||||||
###############################################################################
|
|
||||||
# [ WARNING ]
|
|
||||||
# Configuration file maintained by Juju. Local changes may be overwritten.
|
|
||||||
# Config managed by neutron-openvswitch charm
|
|
||||||
###############################################################################
|
|
||||||
[ovs]
|
|
||||||
enable_tunneling = True
|
|
||||||
local_ip = {{ local_ip }}
|
|
||||||
bridge_mappings = {{ bridge_mappings }}
|
|
||||||
{% if enable_dpdk -%}
|
|
||||||
datapath_type = netdev
|
|
||||||
vhostuser_socket_dir = /run/libvirt-vhost-user
|
|
||||||
{% endif -%}
|
|
||||||
of_inactivity_probe = {{ of_inactivity_probe }}
|
|
||||||
|
|
||||||
[agent]
|
|
||||||
tunnel_types = {{ overlay_network_type }}
|
|
||||||
l2_population = {{ l2_population }}
|
|
||||||
enable_distributed_routing = {{ distributed_routing }}
|
|
||||||
prevent_arp_spoofing = {{ prevent_arp_spoofing }}
|
|
||||||
{% if veth_mtu -%}
|
|
||||||
veth_mtu = {{ veth_mtu }}
|
|
||||||
{% endif -%}
|
|
||||||
polling_interval = {{ polling_interval }}
|
|
||||||
{% if extension_drivers -%}
|
|
||||||
extensions = {{ extension_drivers }}
|
|
||||||
{% endif -%}
|
|
||||||
# See LP 1931696
|
|
||||||
explicitly_egress_direct = True
|
|
||||||
|
|
||||||
[securitygroup]
|
|
||||||
{% if neutron_security_groups and not enable_dpdk -%}
|
|
||||||
enable_security_group = True
|
|
||||||
firewall_driver = {{ firewall_driver }}
|
|
||||||
{% else -%}
|
|
||||||
firewall_driver = neutron.agent.firewall.NoopFirewallDriver
|
|
||||||
enable_security_group = False
|
|
||||||
{% endif -%}
|
|
||||||
|
|
||||||
{% if enable_nsg_logging -%}
|
|
||||||
[network_log]
|
|
||||||
{% if nsg_log_rate_limit -%}
|
|
||||||
rate_limit = {{ nsg_log_rate_limit }}
|
|
||||||
{% endif -%}
|
|
||||||
burst_limit = {{ nsg_log_burst_limit }}
|
|
||||||
{% if nsg_log_output_base -%}
|
|
||||||
local_output_log_base = {{ nsg_log_output_base }}
|
|
||||||
{% endif -%}
|
|
||||||
{% endif -%}
|
|
Loading…
Reference in New Issue