@@ -84,6 +84,11 @@ function neutron_plugin_configure_service {

         fi

     fi

+

+    # Allow for setup the flat type network

+    if [[ -z "$Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS" && -n "$PHYSICAL_NETWORK" ]]; then

+            Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS="flat_networks=$Q_ML2_FLAT_PHYSNET_OPTIONS"

+    fi

     # REVISIT(rkukura): Setting firewall_driver here for

     # neutron.agent.securitygroups_rpc.is_firewall_enabled() which is

     # used in the server, in case no L2 agent is configured on the

@@ -110,6 +115,8 @@ function neutron_plugin_configure_service {

     populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_vxlan $Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS

+    populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_flat $Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS

+

     populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_vlan $Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS

     if [[ "$Q_DVR_MODE" != "legacy" ]]; then