old mode 100644

new mode 100755

@@ -50,6 +50,7 @@ function neutron_plugin_configure_plugin_agent {

             die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts."

         fi

         iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP

+        iniset /$Q_PLUGIN_CONF_FILE ovs tunnel_bridge $OVS_TUNNEL_BRIDGE

     fi

     # Setup physical network bridge mappings.  Override

old mode 100644

new mode 100755

@@ -9,6 +9,7 @@ set +o xtrace

 OVS_BRIDGE=${OVS_BRIDGE:-br-int}

 OVS_DATAPATH_TYPE=${OVS_DATAPATH_TYPE:-""}

+OVS_TUNNEL_BRIDGE=${OVS_TUNNEL_BRIDGE:-br-tun}

 function is_neutron_ovs_base_plugin {

     # Yes, we use OVS.