From 80d11de07e916ef9c77a6b6eec4f3b73481b796f Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Tue, 27 Mar 2012 15:41:07 +0200
Subject: [PATCH] feature #1112: Default host for iSCSI datastore drivers

---
 src/datastore_mad/remotes/iscsi/cp         | 2 +-
 src/datastore_mad/remotes/iscsi/iscsi.conf | 3 +++
 src/datastore_mad/remotes/iscsi/mkfs       | 2 +-
 src/datastore_mad/remotes/iscsi/rm         | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/datastore_mad/remotes/iscsi/cp b/src/datastore_mad/remotes/iscsi/cp
index e7de096d11..7eb8c4bd83 100755
--- a/src/datastore_mad/remotes/iscsi/cp
+++ b/src/datastore_mad/remotes/iscsi/cp
@@ -61,7 +61,7 @@ BASE_PATH="${XPATH_ELEMENTS[0]}"
 RESTRICTED_DIRS="${XPATH_ELEMENTS[1]}"
 SAFE_DIRS="${XPATH_ELEMENTS[2]}"
 UMASK="${XPATH_ELEMENTS[3]}"
-DST_HOST="${XPATH_ELEMENTS[4]}"
+DST_HOST="${XPATH_ELEMENTS[4]:-$HOST}"
 VG_NAME="${XPATH_ELEMENTS[5]:-$VG_NAME}"
 BASE_IQN="${XPATH_ELEMENTS[6]:-$BASE_IQN}"
 BASE_TID="${XPATH_ELEMENTS[7]:-$BASE_TID}"
diff --git a/src/datastore_mad/remotes/iscsi/iscsi.conf b/src/datastore_mad/remotes/iscsi/iscsi.conf
index 2938398891..f8a175f2d8 100644
--- a/src/datastore_mad/remotes/iscsi/iscsi.conf
+++ b/src/datastore_mad/remotes/iscsi/iscsi.conf
@@ -14,6 +14,9 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+# Default iSCSI target host
+HOST=localhost
+
 # Default IQN path
 BASE_IQN=iqn.2012-02.org.opennebula
 
diff --git a/src/datastore_mad/remotes/iscsi/mkfs b/src/datastore_mad/remotes/iscsi/mkfs
index 636f1a5197..c06d64ce6b 100755
--- a/src/datastore_mad/remotes/iscsi/mkfs
+++ b/src/datastore_mad/remotes/iscsi/mkfs
@@ -62,7 +62,7 @@ BASE_PATH="${XPATH_ELEMENTS[0]}"
 RESTRICTED_DIRS="${XPATH_ELEMENTS[1]}"
 SAFE_DIRS="${XPATH_ELEMENTS[2]}"
 UMASK="${XPATH_ELEMENTS[3]}"
-DST_HOST="${XPATH_ELEMENTS[4]}"
+DST_HOST="${XPATH_ELEMENTS[4]:-$HOST}"
 VG_NAME="${XPATH_ELEMENTS[5]:-$VG_NAME}"
 BASE_IQN="${XPATH_ELEMENTS[6]:-$BASE_IQN}"
 BASE_TID="${XPATH_ELEMENTS[7]:-$BASE_TID}"
diff --git a/src/datastore_mad/remotes/iscsi/rm b/src/datastore_mad/remotes/iscsi/rm
index 7b05a7fcf4..3fb58c5710 100755
--- a/src/datastore_mad/remotes/iscsi/rm
+++ b/src/datastore_mad/remotes/iscsi/rm
@@ -49,7 +49,7 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/BASE_TID)
 
 SRC="${XPATH_ELEMENTS[0]}"
-DST_HOST="${XPATH_ELEMENTS[1]}"
+DST_HOST="${XPATH_ELEMENTS[1]:-$HOST}"
 BASE_TID="${XPATH_ELEMENTS[2]:-$BASE_TID}"
 
 BASE_IQN=`echo $SRC|$CUT -d: -f1`