diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index f2fd1814c..5b83c349a 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -47,6 +47,9 @@ OVS_VSWITCH_OCSSCHEMA_FILE=${OVS_VSWITCH_OCSSCHEMA_FILE:-"/usr/share/openvswitch
 # Port status notifier
 ENABLE_PORT_STATUS_NOTIFIER=${ENABLE_PORT_STATUS_NOTIFIER:-"False"}
 
+# Set value of TUNNEL_ENDPOINT_IP if unset
+TUNNEL_ENDPOINT_IP=${TUNNEL_ENDPOINT_IP:-$HOST_IP}
+
 ACTION=$1
 STAGE=$2