diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 8f88af7510..709301e2eb 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -735,7 +735,7 @@ function configure_samba {
 
         for backend_name in ${MANILA_ENABLED_BACKENDS//,/ }; do
             iniset $MANILA_CONF $backend_name driver_handles_share_servers False
-            iniset $MANILA_CONF $backend_name lvm_share_export_ip $HOST_IP
+            iniset $MANILA_CONF $backend_name lvm_share_export_ip $MANILA_LVM_SHARE_EXPORT_IP
         done
         iniset $MANILA_CONF DEFAULT data_node_access_ip $HOST_IP
     fi
diff --git a/devstack/settings b/devstack/settings
index 6b304b908a..a5b72e3d2f 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -146,6 +146,7 @@ MANILA_MNT_DIR=${MANILA_MNT_DIR:=$MANILA_STATE_PATH/mnt}
 SMB_CONF=${SMB_CONF:-/etc/samba/smb.conf}
 SMB_PRIVATE_DIR=${SMB_PRIVATE_DIR:-/var/lib/samba/private}
 CONFIGURE_BACKING_FILE=${CONFIGURE_BACKING_FILE:-"True"}
+MANILA_LVM_SHARE_EXPORT_IP=${MANILA_LVM_SHARE_EXPORT_IP:-$HOST_IP}
 
 # Options for replication
 MANILA_REPLICA_STATE_UPDATE_INTERVAL=${MANILA_REPLICA_STATE_UPDATE_INTERVAL:-300}