diff --git a/install.sh b/install.sh
index 0328898986..a0870373e9 100755
--- a/install.sh
+++ b/install.sh
@@ -267,7 +267,7 @@ VAR_DIRS="$VAR_LOCATION/remotes \
$VAR_LOCATION/remotes/tm/ceph \
$VAR_LOCATION/remotes/tm/dev \
$VAR_LOCATION/remotes/tm/vcenter \
- $VAR_LOCATION/remotes/tm/iscsi \
+ $VAR_LOCATION/remotes/tm/iscsi_libvirt \
$VAR_LOCATION/remotes/hooks \
$VAR_LOCATION/remotes/hooks/ft \
$VAR_LOCATION/remotes/datastore \
@@ -280,7 +280,7 @@ VAR_DIRS="$VAR_LOCATION/remotes \
$VAR_LOCATION/remotes/market/http \
$VAR_LOCATION/remotes/market/one \
$VAR_LOCATION/remotes/market/s3 \
- $VAR_LOCATION/remotes/datastore/iscsi \
+ $VAR_LOCATION/remotes/datastore/iscsi_libvirt \
$VAR_LOCATION/remotes/auth \
$VAR_LOCATION/remotes/auth/plain \
$VAR_LOCATION/remotes/auth/ssh \
@@ -391,7 +391,7 @@ INSTALL_FILES=(
TM_SSH_FILES:$VAR_LOCATION/remotes/tm/ssh
TM_CEPH_FILES:$VAR_LOCATION/remotes/tm/ceph
TM_DEV_FILES:$VAR_LOCATION/remotes/tm/dev
- TM_ISCSI_FILES:$VAR_LOCATION/remotes/tm/iscsi
+ TM_ISCSI_FILES:$VAR_LOCATION/remotes/tm/iscsi_libvirt
TM_DUMMY_FILES:$VAR_LOCATION/remotes/tm/dummy
TM_VCENTER_FILES:$VAR_LOCATION/remotes/tm/vcenter
DATASTORE_DRIVER_COMMON_SCRIPTS:$VAR_LOCATION/remotes/datastore/
@@ -400,7 +400,7 @@ INSTALL_FILES=(
DATASTORE_DRIVER_CEPH_SCRIPTS:$VAR_LOCATION/remotes/datastore/ceph
DATASTORE_DRIVER_DEV_SCRIPTS:$VAR_LOCATION/remotes/datastore/dev
DATASTORE_DRIVER_VCENTER_SCRIPTS:$VAR_LOCATION/remotes/datastore/vcenter
- DATASTORE_DRIVER_ISCSI_SCRIPTS:$VAR_LOCATION/remotes/datastore/iscsi
+ DATASTORE_DRIVER_ISCSI_SCRIPTS:$VAR_LOCATION/remotes/datastore/iscsi_libvirt
MARKETPLACE_DRIVER_HTTP_SCRIPTS:$VAR_LOCATION/remotes/market/http
MARKETPLACE_DRIVER_ONE_SCRIPTS:$VAR_LOCATION/remotes/market/one
MARKETPLACE_DRIVER_S3_SCRIPTS:$VAR_LOCATION/remotes/market/s3
@@ -840,7 +840,7 @@ NETWORK_OVSWITCH_FILES="src/vnm_mad/remotes/ovswitch/clean \
# - DUMMY TM, $VAR_LOCATION/tm/dummy
# - CEPH TM, $VAR_LOCATION/tm/ceph
# - DEV TM, $VAR_LOCATION/tm/dev
-# - ISCSI TM, $VAR_LOCATION/tm/iscsi
+# - ISCSI TM, $VAR_LOCATION/tm/iscsi_libvirt
#-------------------------------------------------------------------------------
TM_FILES="src/tm_mad/tm_common.sh"
@@ -979,19 +979,19 @@ TM_VCENTER_FILES="src/tm_mad/vcenter/clone \
src/tm_mad/vcenter/failmigrate \
src/tm_mad/vcenter/delete"
-TM_ISCSI_FILES="src/tm_mad/iscsi/clone \
- src/tm_mad/iscsi/ln \
- src/tm_mad/iscsi/mv \
- src/tm_mad/iscsi/mvds \
- src/tm_mad/iscsi/cpds \
- src/tm_mad/iscsi/premigrate \
- src/tm_mad/iscsi/postmigrate \
- src/tm_mad/iscsi/snap_create \
- src/tm_mad/iscsi/snap_create_live \
- src/tm_mad/iscsi/snap_delete \
- src/tm_mad/iscsi/snap_revert \
- src/tm_mad/iscsi/failmigrate \
- src/tm_mad/iscsi/delete"
+TM_ISCSI_FILES="src/tm_mad/iscsi_libvirt/clone \
+ src/tm_mad/iscsi_libvirt/ln \
+ src/tm_mad/iscsi_libvirt/mv \
+ src/tm_mad/iscsi_libvirt/mvds \
+ src/tm_mad/iscsi_libvirt/cpds \
+ src/tm_mad/iscsi_libvirt/premigrate \
+ src/tm_mad/iscsi_libvirt/postmigrate \
+ src/tm_mad/iscsi_libvirt/snap_create \
+ src/tm_mad/iscsi_libvirt/snap_create_live \
+ src/tm_mad/iscsi_libvirt/snap_delete \
+ src/tm_mad/iscsi_libvirt/snap_revert \
+ src/tm_mad/iscsi_libvirt/failmigrate \
+ src/tm_mad/iscsi_libvirt/delete"
#-------------------------------------------------------------------------------
# Datastore drivers, to be installed under $REMOTES_LOCATION/datastore
@@ -1062,15 +1062,15 @@ DATASTORE_DRIVER_VCENTER_SCRIPTS="src/datastore_mad/remotes/vcenter/cp \
src/datastore_mad/remotes/vcenter/clone \
src/datastore_mad/remotes/vcenter/export"
-DATASTORE_DRIVER_ISCSI_SCRIPTS="src/datastore_mad/remotes/iscsi/cp \
- src/datastore_mad/remotes/iscsi/mkfs \
- src/datastore_mad/remotes/iscsi/stat \
- src/datastore_mad/remotes/iscsi/rm \
- src/datastore_mad/remotes/iscsi/monitor \
- src/datastore_mad/remotes/iscsi/snap_delete \
- src/datastore_mad/remotes/iscsi/snap_revert \
- src/datastore_mad/remotes/iscsi/snap_flatten \
- src/datastore_mad/remotes/iscsi/clone"
+DATASTORE_DRIVER_ISCSI_SCRIPTS="src/datastore_mad/remotes/iscsi_libvirt/cp \
+ src/datastore_mad/remotes/iscsi_libvirt/mkfs \
+ src/datastore_mad/remotes/iscsi_libvirt/stat \
+ src/datastore_mad/remotes/iscsi_libvirt/rm \
+ src/datastore_mad/remotes/iscsi_libvirt/monitor \
+ src/datastore_mad/remotes/iscsi_libvirt/snap_delete \
+ src/datastore_mad/remotes/iscsi_libvirt/snap_revert \
+ src/datastore_mad/remotes/iscsi_libvirt/snap_flatten \
+ src/datastore_mad/remotes/iscsi_libvirt/clone"
#-------------------------------------------------------------------------------
# Marketplace drivers, to be installed under $REMOTES_LOCATION/market
diff --git a/share/etc/oned.conf b/share/etc/oned.conf
index a33ea1c8f2..6207315e09 100644
--- a/share/etc/oned.conf
+++ b/share/etc/oned.conf
@@ -512,7 +512,7 @@ VM_MAD = [
TM_MAD = [
EXECUTABLE = "one_tm",
- ARGUMENTS = "-t 15 -d dummy,lvm,shared,fs_lvm,qcow2,ssh,ceph,dev,vcenter,iscsi"
+ ARGUMENTS = "-t 15 -d dummy,lvm,shared,fs_lvm,qcow2,ssh,ceph,dev,vcenter,iscsi_libvirt"
]
#*******************************************************************************
@@ -531,7 +531,7 @@ TM_MAD = [
DATASTORE_MAD = [
EXECUTABLE = "one_datastore",
- ARGUMENTS = "-t 15 -d dummy,fs,lvm,ceph,dev,iscsi,vcenter -s shared,ssh,ceph,fs_lvm"
+ ARGUMENTS = "-t 15 -d dummy,fs,lvm,ceph,dev,iscsi_libvirt,vcenter -s shared,ssh,ceph,fs_lvm"
]
#*******************************************************************************
@@ -893,7 +893,7 @@ TM_MAD_CONF = [
]
TM_MAD_CONF = [
- NAME = "iscsi", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
+ NAME = "iscsi_libvirt", LN_TARGET = "NONE", CLONE_TARGET = "SELF", SHARED = "YES",
DS_MIGRATE = "NO"
]
@@ -931,7 +931,7 @@ DS_MAD_CONF = [
]
DS_MAD_CONF = [
- NAME = "iscsi", REQUIRED_ATTRS = "DISK_TYPE,ISCSI_HOST",
+ NAME = "iscsi_libvirt", REQUIRED_ATTRS = "DISK_TYPE,ISCSI_HOST",
PERSISTENT_ONLY = "YES"
]
diff --git a/src/datastore_mad/remotes/iscsi/clone b/src/datastore_mad/remotes/iscsi_libvirt/clone
similarity index 100%
rename from src/datastore_mad/remotes/iscsi/clone
rename to src/datastore_mad/remotes/iscsi_libvirt/clone
diff --git a/src/datastore_mad/remotes/iscsi/cp b/src/datastore_mad/remotes/iscsi_libvirt/cp
similarity index 100%
rename from src/datastore_mad/remotes/iscsi/cp
rename to src/datastore_mad/remotes/iscsi_libvirt/cp
diff --git a/src/datastore_mad/remotes/iscsi/mkfs b/src/datastore_mad/remotes/iscsi_libvirt/mkfs
similarity index 100%
rename from src/datastore_mad/remotes/iscsi/mkfs
rename to src/datastore_mad/remotes/iscsi_libvirt/mkfs
diff --git a/src/datastore_mad/remotes/iscsi/monitor b/src/datastore_mad/remotes/iscsi_libvirt/monitor
similarity index 100%
rename from src/datastore_mad/remotes/iscsi/monitor
rename to src/datastore_mad/remotes/iscsi_libvirt/monitor
diff --git a/src/datastore_mad/remotes/iscsi/rm b/src/datastore_mad/remotes/iscsi_libvirt/rm
similarity index 100%
rename from src/datastore_mad/remotes/iscsi/rm
rename to src/datastore_mad/remotes/iscsi_libvirt/rm
diff --git a/src/datastore_mad/remotes/iscsi/snap_delete b/src/datastore_mad/remotes/iscsi_libvirt/snap_delete
similarity index 100%
rename from src/datastore_mad/remotes/iscsi/snap_delete
rename to src/datastore_mad/remotes/iscsi_libvirt/snap_delete
diff --git a/src/datastore_mad/remotes/iscsi/snap_flatten b/src/datastore_mad/remotes/iscsi_libvirt/snap_flatten
similarity index 100%
rename from src/datastore_mad/remotes/iscsi/snap_flatten
rename to src/datastore_mad/remotes/iscsi_libvirt/snap_flatten
diff --git a/src/datastore_mad/remotes/iscsi/snap_revert b/src/datastore_mad/remotes/iscsi_libvirt/snap_revert
similarity index 100%
rename from src/datastore_mad/remotes/iscsi/snap_revert
rename to src/datastore_mad/remotes/iscsi_libvirt/snap_revert
diff --git a/src/datastore_mad/remotes/iscsi/stat b/src/datastore_mad/remotes/iscsi_libvirt/stat
similarity index 100%
rename from src/datastore_mad/remotes/iscsi/stat
rename to src/datastore_mad/remotes/iscsi_libvirt/stat
diff --git a/src/nebula/NebulaTemplate.cc b/src/nebula/NebulaTemplate.cc
index 8c95085940..3b55eee997 100644
--- a/src/nebula/NebulaTemplate.cc
+++ b/src/nebula/NebulaTemplate.cc
@@ -127,14 +127,14 @@ void OpenNebulaTemplate::set_multiple_conf_default()
# vmfs
#******
*/
- set_conf_ds("dev", "DISK_TYPE", "YES");
- set_conf_ds("iscsi", "DISK_TYPE,ISCSI_HOST", "YES");
- set_conf_ds("dummy", "", "NO");
- set_conf_ds("fs", "", "NO");
- set_conf_ds("lvm", "DISK_TYPE", "NO");
- set_conf_ds("shared", "", "NO");
- set_conf_ds("ssh", "", "NO");
- set_conf_ds("vmfs", "BRIDGE_LIST", "NO");
+ set_conf_ds("dev", "DISK_TYPE", "YES");
+ set_conf_ds("iscsi_libvirt", "DISK_TYPE,ISCSI_HOST", "YES");
+ set_conf_ds("dummy", "", "NO");
+ set_conf_ds("fs", "", "NO");
+ set_conf_ds("lvm", "DISK_TYPE", "NO");
+ set_conf_ds("shared", "", "NO");
+ set_conf_ds("ssh", "", "NO");
+ set_conf_ds("vmfs", "BRIDGE_LIST", "NO");
set_conf_ds("ceph",
"DISK_TYPE,BRIDGE_LIST,CEPH_HOST,CEPH_USER,CEPH_SECRET",
"NO");
diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
index a5a985635f..bbf501f824 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create.js
@@ -155,7 +155,7 @@ define(function(require) {
case 'dev':
_selectDevices(dialog);
break;
- case 'iscsi':
+ case 'iscsi_libvirt':
_selectISCSI(dialog);
break;
case 'vcenter':
@@ -467,9 +467,9 @@ define(function(require) {
}
function _selectISCSI(dialog) {
- $('select#ds_mad', dialog).val('iscsi').change();
+ $('select#ds_mad', dialog).val('iscsi_libvirt').change();
$('select#ds_mad', dialog).attr('disabled', 'disabled');
- $('select#tm_mad', dialog).val('iscsi');
+ $('select#tm_mad', dialog).val('iscsi_libvirt');
$('select#tm_mad', dialog).attr('disabled', 'disabled');
$('input#image_ds_type', dialog).click();
$('input[name=ds_type]', dialog).attr('disabled', 'disabled');
diff --git a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs
index 57105f0fa0..73e887394a 100644
--- a/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs
+++ b/src/sunstone/public/app/tabs/datastores-tab/form-panels/create/wizard.hbs
@@ -30,7 +30,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -83,7 +83,7 @@
-
+
@@ -103,7 +103,7 @@
-
+
diff --git a/src/tm_mad/iscsi/clone b/src/tm_mad/iscsi_libvirt/clone
similarity index 100%
rename from src/tm_mad/iscsi/clone
rename to src/tm_mad/iscsi_libvirt/clone
diff --git a/src/tm_mad/iscsi/cpds b/src/tm_mad/iscsi_libvirt/cpds
similarity index 100%
rename from src/tm_mad/iscsi/cpds
rename to src/tm_mad/iscsi_libvirt/cpds
diff --git a/src/tm_mad/iscsi/delete b/src/tm_mad/iscsi_libvirt/delete
similarity index 100%
rename from src/tm_mad/iscsi/delete
rename to src/tm_mad/iscsi_libvirt/delete
diff --git a/src/tm_mad/iscsi/failmigrate b/src/tm_mad/iscsi_libvirt/failmigrate
similarity index 100%
rename from src/tm_mad/iscsi/failmigrate
rename to src/tm_mad/iscsi_libvirt/failmigrate
diff --git a/src/tm_mad/iscsi/ln b/src/tm_mad/iscsi_libvirt/ln
similarity index 100%
rename from src/tm_mad/iscsi/ln
rename to src/tm_mad/iscsi_libvirt/ln
diff --git a/src/tm_mad/iscsi/mv b/src/tm_mad/iscsi_libvirt/mv
similarity index 100%
rename from src/tm_mad/iscsi/mv
rename to src/tm_mad/iscsi_libvirt/mv
diff --git a/src/tm_mad/iscsi/mvds b/src/tm_mad/iscsi_libvirt/mvds
similarity index 100%
rename from src/tm_mad/iscsi/mvds
rename to src/tm_mad/iscsi_libvirt/mvds
diff --git a/src/tm_mad/iscsi/postmigrate b/src/tm_mad/iscsi_libvirt/postmigrate
similarity index 100%
rename from src/tm_mad/iscsi/postmigrate
rename to src/tm_mad/iscsi_libvirt/postmigrate
diff --git a/src/tm_mad/iscsi/premigrate b/src/tm_mad/iscsi_libvirt/premigrate
similarity index 100%
rename from src/tm_mad/iscsi/premigrate
rename to src/tm_mad/iscsi_libvirt/premigrate
diff --git a/src/tm_mad/iscsi/snap_create b/src/tm_mad/iscsi_libvirt/snap_create
similarity index 100%
rename from src/tm_mad/iscsi/snap_create
rename to src/tm_mad/iscsi_libvirt/snap_create
diff --git a/src/tm_mad/iscsi/snap_create_live b/src/tm_mad/iscsi_libvirt/snap_create_live
similarity index 100%
rename from src/tm_mad/iscsi/snap_create_live
rename to src/tm_mad/iscsi_libvirt/snap_create_live
diff --git a/src/tm_mad/iscsi/snap_delete b/src/tm_mad/iscsi_libvirt/snap_delete
similarity index 100%
rename from src/tm_mad/iscsi/snap_delete
rename to src/tm_mad/iscsi_libvirt/snap_delete
diff --git a/src/tm_mad/iscsi/snap_revert b/src/tm_mad/iscsi_libvirt/snap_revert
similarity index 100%
rename from src/tm_mad/iscsi/snap_revert
rename to src/tm_mad/iscsi_libvirt/snap_revert