summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2010-06-12 13:03:58 -0500
committerMike Christie <michaelc@cs.wisc.edu>2010-07-01 20:49:48 -0500
commit4b46754baa181f18cd293a0f377235e1e0de4a82 (patch)
tree1477490fff30db2bf959e4de1e19b70b4ac24b50 /etc
parente5025aef77b9484e4bcb04b35aa54c061059e865 (diff)
downloadopen-iscsi-4b46754baa181f18cd293a0f377235e1e0de4a82.tar.gz
iscsid: fix sendtargets discovery daemon CHAP handling
We may need to have different CHAP settings for each discovery portal. This patch has us use the discovery records instead of the iscsid.conf method of specifying the sendtargets info. If the discovery record has discovery.sendtargets.use_discoveryd = Yes then iscsid will use that record to do sendtargets discovery. The poll interval can be set with discovery.sendtargets.discoveryd_poll_inval.
Diffstat (limited to 'etc')
-rw-r--r--etc/iscsid.conf34
1 files changed, 0 insertions, 34 deletions
diff --git a/etc/iscsid.conf b/etc/iscsid.conf
index 78c225c..de4252d 100644
--- a/etc/iscsid.conf
+++ b/etc/iscsid.conf
@@ -23,40 +23,6 @@
iscsid.startup = /sbin/iscsid
-
-
-##############################
-# SendTargets Discovery Daemon
-##############################
-# If instead of doing discovery with iscsiadm and then logging
-# into the targets stored in the node db, set the following value
-# to have iscsid perform SendTargets discovery and log into all
-# the portals found.
-#
-# This will use the ifaces that are set up when iscsid is started up.
-#
-# This value for this is a list of addresses and ports. The address and
-# port should be separated by a comma. Each address port tuple should be
-# separated by a space. The port is optional. If not set then the iSCSI
-# default 3260 will be used.
-#
-# Example (first address has a port and the final two use the default 3260):
-#
-# discovery.daemon.sendtargets.addresses = 192.168.0.21,1234 192.168.1.20 192.168.10.10
-#
-# By default iscsid will check the discovery addresses above every 30
-# seconds. To change this change the following value. poll_interval is
-# in seconds, and 0 will instruct iscsid to not poll (will do discovery
-# once then complete).
-#
-# discovery.daemon.sendtargets.poll_interval = 30
-#
-# Note: This currently only logs into new portals. It does not
-# log out of portals that are no longer returned from SendTargets.
-# To remove them run "iscsiadm -m session -r $SID -u"
-
-
-
#######################
# iSNS Discovery Daemon
#######################