From 36c3512f3765045b5161bb17c618036df757622e Mon Sep 17 00:00:00 2001
From: Jaime Melis <jmelis@opennebula.org>
Date: Fri, 9 Aug 2013 12:23:05 -0400
Subject: [PATCH] feature-2262: Remove HOST default attribute from lvm.conf

---
 src/datastore_mad/remotes/lvm/clone    | 7 ++++++-
 src/datastore_mad/remotes/lvm/cp       | 7 ++++++-
 src/datastore_mad/remotes/lvm/lvm.conf | 3 ---
 src/datastore_mad/remotes/lvm/mkfs     | 7 ++++++-
 src/datastore_mad/remotes/lvm/monitor  | 8 ++++++--
 src/datastore_mad/remotes/lvm/rm       | 7 ++++++-
 6 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/datastore_mad/remotes/lvm/clone b/src/datastore_mad/remotes/lvm/clone
index 1bd1ded118..7c99033e47 100755
--- a/src/datastore_mad/remotes/lvm/clone
+++ b/src/datastore_mad/remotes/lvm/clone
@@ -51,11 +51,16 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
                     /DS_DRIVER_ACTION_DATA/IMAGE/SIZE)
 
 BASE_PATH="${XPATH_ELEMENTS[j++]}"
-DST_HOST="${XPATH_ELEMENTS[j++]:-$HOST}"
+DST_HOST="${XPATH_ELEMENTS[j++]}"
 VG_NAME="${XPATH_ELEMENTS[j++]:-$VG_NAME}"
 SRC="${XPATH_ELEMENTS[j++]}"
 SIZE="${XPATH_ELEMENTS[j++]}"
 
+if [ -z "$DST_HOST" ]; then
+    error_message "Datastore template missing 'HOST' attribute."
+    exit -1
+fi
+
 SAFE_DIRS=""
 
 SRC_HOST=`echo $SRC|cut -d. -f1`
diff --git a/src/datastore_mad/remotes/lvm/cp b/src/datastore_mad/remotes/lvm/cp
index f699c7367c..7c9d95b0dd 100755
--- a/src/datastore_mad/remotes/lvm/cp
+++ b/src/datastore_mad/remotes/lvm/cp
@@ -63,7 +63,7 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
 BASE_PATH="${XPATH_ELEMENTS[j++]}"
 RESTRICTED_DIRS="${XPATH_ELEMENTS[j++]}"
 SAFE_DIRS="${XPATH_ELEMENTS[j++]}"
-DST_HOST="${XPATH_ELEMENTS[j++]:-$HOST}"
+DST_HOST="${XPATH_ELEMENTS[j++]}"
 VG_NAME="${XPATH_ELEMENTS[j++]:-$VG_NAME}"
 SRC="${XPATH_ELEMENTS[j++]}"
 SIZE="${XPATH_ELEMENTS[j++]}"
@@ -72,6 +72,11 @@ SHA1="${XPATH_ELEMENTS[j++]}"
 NO_DECOMPRESS="${XPATH_ELEMENTS[j++]}"
 LIMIT_TRANSFER_BW="${XPATH_ELEMENTS[j++]}"
 
+if [ -z "$DST_HOST" ]; then
+    error_message "Datastore template missing 'HOST' attribute."
+    exit -1
+fi
+
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
 
 LV_NAME="lv-one-${ID}"
diff --git a/src/datastore_mad/remotes/lvm/lvm.conf b/src/datastore_mad/remotes/lvm/lvm.conf
index c063085ade..9e2874ead6 100644
--- a/src/datastore_mad/remotes/lvm/lvm.conf
+++ b/src/datastore_mad/remotes/lvm/lvm.conf
@@ -17,8 +17,5 @@
 # Default volume group
 VG_NAME=vg-one
 
-# Default LVM server host
-HOST=localhost
-
 # Default LV snapshot SIZE
 DEFAULT_SIZE=512
diff --git a/src/datastore_mad/remotes/lvm/mkfs b/src/datastore_mad/remotes/lvm/mkfs
index b568887387..3f28dcef97 100755
--- a/src/datastore_mad/remotes/lvm/mkfs
+++ b/src/datastore_mad/remotes/lvm/mkfs
@@ -57,11 +57,16 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/BASE_PATH \
 BASE_PATH="${XPATH_ELEMENTS[j++]}"
 RESTRICTED_DIRS="${XPATH_ELEMENTS[j++]}"
 SAFE_DIRS="${XPATH_ELEMENTS[j++]}"
-DST_HOST="${XPATH_ELEMENTS[j++]:-$HOST}"
+DST_HOST="${XPATH_ELEMENTS[j++]}"
 VG_NAME="${XPATH_ELEMENTS[j++]:-$VG_NAME}"
 FSTYPE="${XPATH_ELEMENTS[j++]}"
 SIZE="${XPATH_ELEMENTS[j++]}"
 
+if [ -z "$DST_HOST" ]; then
+    error_message "Datastore template missing 'HOST' attribute."
+    exit -1
+fi
+
 set_up_datastore "$BASE_PATH" "$RESTRICTED_DIRS" "$SAFE_DIRS"
 
 LV_NAME="lv-one-${ID}"
diff --git a/src/datastore_mad/remotes/lvm/monitor b/src/datastore_mad/remotes/lvm/monitor
index f11fe7ac9c..006a24bb45 100755
--- a/src/datastore_mad/remotes/lvm/monitor
+++ b/src/datastore_mad/remotes/lvm/monitor
@@ -48,9 +48,13 @@ while IFS= read -r -d '' element; do
 done < <($XPATH     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/VG_NAME)
 
-HOST="${XPATH_ELEMENTS[j++]:-$HOST}"
-VG_NAME="${XPATH_ELEMENTS[j++]:-$VG_NAME}"
+HOST="${XPATH_ELEMENTS[j++]}"
+VG_NAME="${XPATH_ELEMENTS[j++]-$VG_NAME}"
 
+if [ -z "$HOST" ]; then
+    error_message "Datastore template missing 'HOST' attribute."
+    exit -1
+fi
 # ------------ Compute datastore usage -------------
 
 MONITOR_SCRIPT=$(cat <<EOF
diff --git a/src/datastore_mad/remotes/lvm/rm b/src/datastore_mad/remotes/lvm/rm
index d4f5f2f6c8..7543df6e5d 100755
--- a/src/datastore_mad/remotes/lvm/rm
+++ b/src/datastore_mad/remotes/lvm/rm
@@ -48,7 +48,12 @@ done < <($XPATH     /DS_DRIVER_ACTION_DATA/IMAGE/SOURCE \
                     /DS_DRIVER_ACTION_DATA/DATASTORE/TEMPLATE/HOST)
 
 SRC="${XPATH_ELEMENTS[j++]}"
-DST_HOST="${XPATH_ELEMENTS[j++]:-$HOST}"
+DST_HOST="${XPATH_ELEMENTS[j++]}"
+
+if [ -z "$DST_HOST" ]; then
+    error_message "Datastore template missing 'HOST' attribute."
+    exit -1
+fi
 
 TARGET=`echo $SRC|$CUT -d: -f2`
 LV_NAME=`echo $TARGET|$AWK -F. '{print $(NF)}'`