Merge "[OVN] Enable test_multicast_between_vms_on_same_network"

devstack/lib/ovn_agent

@@ -96,6 +96,8 @@ if [[ "$SERVICE_IP_VERSION" == 6 ]]; then
     OVSDB_SERVER_LOCAL_HOST=[$OVSDB_SERVER_LOCAL_HOST]
 fi
 
+OVN_IGMP_SNOOPING_ENABLE=$(trueorfalse False OVN_IGMP_SNOOPING_ENABLE)
+
 OVS_PREFIX=/usr/local
 OVS_SBINDIR=$OVS_PREFIX/sbin
 OVS_BINDIR=$OVS_PREFIX/bin
@@ -530,6 +532,8 @@ function configure_ovn_plugin {
             iniset $NEUTRON_CONF DEFAULT dns_domain openstackgate.local
             populate_ml2_config /$Q_PLUGIN_CONF_FILE ovn dns_servers="$OVN_DNS_SERVERS"
         fi
+
+        iniset $NEUTRON_CONF ovs igmp_snooping_enable $OVN_IGMP_SNOOPING_ENABLE
     fi
 
     if is_service_enabled q-dhcp neutron-dhcp ; then

zuul.d/tempest-multinode.yaml

@@ -100,6 +100,11 @@
       - zuul: openstack/neutron-tempest-plugin
     pre-run: playbooks/multinode-setup.yaml
     vars:
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            neutron_plugin_options:
+              is_igmp_snooping_enabled: True
       devstack_localrc:
         Q_AGENT: ovn
         Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
@@ -122,6 +127,7 @@
         ADVANCED_INSTANCE_USER: ubuntu
         BUILD_TIMEOUT: 784
         ENABLE_TLS: True
+        OVN_IGMP_SNOOPING_ENABLE: True
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron
         neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin

zuul.d/tempest-singlenode.yaml

@@ -189,6 +189,11 @@
         (^neutron_tempest_plugin.scenario)|\
         (tempest.(api|scenario|thirdparty))).*$"
       tempest_concurrency: 4
+      devstack_local_conf:
+        test-config:
+          $TEMPEST_CONFIG:
+            neutron_plugin_options:
+              is_igmp_snooping_enabled: True
       devstack_localrc:
         Q_AGENT: ovn
         Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
@@ -213,6 +218,7 @@
         ADVANCED_INSTANCE_USER: ubuntu
         BUILD_TIMEOUT: 784
         ENABLE_TLS: True
+        OVN_IGMP_SNOOPING_ENABLE: True
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron
         neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin