Merge "Enable flat network for ovn"

environments/neutron-ml2-ovn-ha.yaml

@@ -20,7 +20,7 @@ parameter_defaults:
   OVNQosDriver: ovn-qos
   OVNTunnelEncapType: geneve
   NeutronTypeDrivers: 'geneve,vlan,flat'
-  NeutronNetworkType: 'geneve'
+  NeutronNetworkType: ['geneve', 'vlan', 'flat']
   NeutronServicePlugins: 'qos,ovn-router,trunk'
   NeutronVniRanges: ['1:65536', ]
 

environments/services/neutron-ovn-dvr-ha.yaml

@@ -22,7 +22,7 @@ parameter_defaults:
   OVNQosDriver: ovn-qos
   OVNTunnelEncapType: geneve
   NeutronTypeDrivers: 'geneve,vlan,flat'
-  NeutronNetworkType: ['geneve' , 'vlan']
+  NeutronNetworkType: ['geneve' , 'vlan', 'flat']
   NeutronServicePlugins: 'qos,ovn-router,trunk'
   NeutronVniRanges: ['1:65536', ]
   NeutronRpcWorkers: 1

environments/services/neutron-ovn-ha.yaml

@@ -20,7 +20,7 @@ parameter_defaults:
   OVNQosDriver: ovn-qos
   OVNTunnelEncapType: geneve
   NeutronTypeDrivers: 'geneve,vlan,flat'
-  NeutronNetworkType: ['geneve' , 'vlan']
+  NeutronNetworkType: ['geneve' , 'vlan', 'flat']
   NeutronServicePlugins: 'qos,ovn-router,trunk'
   NeutronVniRanges: ['1:65536', ]
   NeutronPluginExtensions: "qos,port_security,dns"

environments/services/neutron-ovn-standalone.yaml

@@ -22,7 +22,7 @@ parameter_defaults:
   OVNQosDriver: ovn-qos
   OVNTunnelEncapType: geneve
   NeutronTypeDrivers: 'geneve,vlan,flat'
-  NeutronNetworkType: ['geneve' , 'vlan']
+  NeutronNetworkType: ['geneve' , 'vlan', 'flat']
   NeutronServicePlugins: 'qos,ovn-router,trunk'
   NeutronVniRanges: ['1:65536', ]
   NeutronRpcWorkers: 1

puppet/services/neutron-plugin-ml2-ovn.yaml

@@ -71,7 +71,7 @@ parameters:
     description: Whether Metadata Service has to be enabled
     type: boolean
     default: true
-  # NOTE(anil): OVN supports only VLAN and geneve networks
+  # NOTE(anil): OVN supports only VLAN, geneve and flat networks
   NeutronNetworkType:
     default: 'geneve'
     description: The tenant network type for Neutron.
@@ -80,7 +80,7 @@ parameters:
       - allowed_values:
           - geneve
           - vlan
-
+          - flat
   OVNDnsServers:
     default: []
     description: List of servers to use as as dns forwarders

tools/yaml-validate.py

@@ -174,10 +174,10 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
                                                                'constraints'],
                                    # NOTE(anil): This is a temporary change and
                                    # will be removed once bug #1767070 properly
-                                   # fixed. OVN supports only VLAN and geneve
+                                   # fixed. OVN supports only VLAN, geneve
-                                   # for NeutronNetworkType. But VLAN tenant
+                                   # and flat for NeutronNetworkType. But VLAN
-                                   # networks have a limited support in OVN.
+                                   # tenant networks have a limited support
-                                   # Till that is fixed, we restrict
+                                   # in OVN. Till that is fixed, we restrict
                                    # NeutronNetworkType to 'geneve'.
                                    'NeutronNetworkType': ['description',
                                                           'default',