From 31fa9ada75609602ae2803d1739461e9472303ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20J=C3=B3zefczyk?= Date: Thu, 23 Apr 2020 14:18:14 +0200 Subject: [PATCH] [OVN] Update sample local.conf to support QoS for OVN This change updates sample OVN local.conf files in order to enable q-qos service and compile kernel module. Some distros, like Ubuntu Bionic, doesn't support ovs meters with default shipped kernel. Change-Id: I6c4878c8718e42814f50f8f7eba86cfde49e18d5 --- devstack/ovn-compute-local.conf.sample | 6 ++++-- devstack/ovn-local.conf.sample | 8 +++++--- devstack/ovn-vtep-local.conf.sample | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/devstack/ovn-compute-local.conf.sample b/devstack/ovn-compute-local.conf.sample index 2ce732a7f1b..1f184e9869e 100644 --- a/devstack/ovn-compute-local.conf.sample +++ b/devstack/ovn-compute-local.conf.sample @@ -55,10 +55,12 @@ OVN_SB_REMOTE=tcp:$SERVICE_HOST:6642 #OVN_UUID= # Whether or not to build custom openvswitch kernel modules from the ovs git -# tree. This is enabled by default. This is required unless your distro kernel +# tree. This is disabled by default. This is required unless your distro kernel # includes ovs+conntrack support. This support was first released in Linux 4.3, # and will likely be backported by some distros. -#OVN_BUILD_MODULES=False +# NOTE(mjozefcz): We need to compile the module for Ubuntu Bionic, because default +# shipped kernel module doesn't openflow meter action support. +OVN_BUILD_MODULES=True HOST_IP= NOVA_VNC_ENABLED=True diff --git a/devstack/ovn-local.conf.sample b/devstack/ovn-local.conf.sample index 18e2ac52e0f..5914c9dc37b 100644 --- a/devstack/ovn-local.conf.sample +++ b/devstack/ovn-local.conf.sample @@ -47,7 +47,7 @@ disable_service q-meta enable_plugin neutron https://opendev.org/openstack/neutron enable_service q-trunk enable_service q-dns -#enable_service q-qos +enable_service q-qos # Enable neutron tempest plugin tests enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin @@ -92,10 +92,12 @@ disable_service cinder c-sch c-api c-vol #OVN_L3_SCHEDULER=leastloaded # Whether or not to build custom openvswitch kernel modules from the ovs git -# tree. This is enabled by default. This is required unless your distro kernel +# tree. This is disabled by default. This is required unless your distro kernel # includes ovs+conntrack support. This support was first released in Linux 4.3, # and will likely be backported by some distros. -#OVN_BUILD_MODULES=False +# NOTE(mjozefcz): We need to compile the module for Ubuntu Bionic, because default +# shipped kernel module doesn't openflow meter action support. +OVN_BUILD_MODULES=True # Skydive #enable_plugin skydive https://github.com/redhat-cip/skydive.git diff --git a/devstack/ovn-vtep-local.conf.sample b/devstack/ovn-vtep-local.conf.sample index cb29650cd98..7a180fd4bff 100644 --- a/devstack/ovn-vtep-local.conf.sample +++ b/devstack/ovn-vtep-local.conf.sample @@ -33,7 +33,9 @@ enable_service ovn-controller-vtep #OVN_UUID= # Whether or not to build custom openvswitch kernel modules from the ovs git -# tree. This is enabled by default. This is required unless your distro kernel +# tree. This is disabled by default. This is required unless your distro kernel # includes ovs+conntrack support. This support was first released in Linux 4.3, # and will likely be backported by some distros. -#OVN_BUILD_MODULES=False +# NOTE(mjozefcz): We need to compile the module for Ubuntu Bionic, because default +# shipped kernel module doesn't openflow meter action support. +OVN_BUILD_MODULES=True