On Mon, 14 Dec 2009 11:40:55 +0100 Albert Pauw <albert.pauw@xxxxxxxxx> wrote: > FUJITA Tomonori wrote: > > On Mon, 14 Dec 2009 11:11:07 +0100 > > Albert Pauw <albert.pauw@xxxxxxxxx> wrote: > > > > > >> I've attached the patches to move targets.conf.example to conf/examples/ > >> as well as the vtl examples (with the name Tomo suggested). > >> > > > > Thanks! > > > > > > > >> As for the Makefile changes, I couldn't find anything to change, as only > >> the empty targets.conf is installed as a dummy from conf/ which I just > >> left as it was. > >> > > > > I think we need to > > > > 1) modify doc/Makefile not to install targets.conf.example. > > 2) modify conf/Makefile to create conf/examples/ and install the new > > example files to it. > > > > > Something like this? We need to add tricks a bit. This works for me. = From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Subject: [PATCH] create conf/examples for multiple targets.conf examples doc/targets.conf.example to conf/examples/targets.conf.example Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> --- conf/Makefile | 4 + conf/examples/targets.conf.example | 239 ++++++++++++++++++++++++++++++++++++ doc/Makefile | 3 +- doc/targets.conf.example | 239 ------------------------------------ 4 files changed, 244 insertions(+), 241 deletions(-) create mode 100644 conf/examples/targets.conf.example delete mode 100644 doc/targets.conf.example diff --git a/conf/Makefile b/conf/Makefile index 0ef29ab..d6b5ea6 100644 --- a/conf/Makefile +++ b/conf/Makefile @@ -1,5 +1,7 @@ sysconfdir ?= /etc +EXAMPLES = targets.conf.example + .PHONY: all all: @@ -9,6 +11,8 @@ install: if [ ! -f $(DESTDIR)$(sysconfdir)/tgt/targets.conf ] ; then \ install -m 644 targets.conf $(DESTDIR)$(sysconfdir)/tgt ; \ fi + install -d -m 755 $(DESTDIR)$(sysconfdir)/tgt/examples + install -m 644 examples/$(EXAMPLES) $(DESTDIR)$(sysconfdir)/tgt/examples .PHONY: clean clean: diff --git a/conf/examples/targets.conf.example b/conf/examples/targets.conf.example new file mode 100644 index 0000000..2f8020a --- /dev/null +++ b/conf/examples/targets.conf.example @@ -0,0 +1,239 @@ +# This is a sample config file for tgt-admin. +# By default, tgt-admin looks for its config file in /etc/tgt/targets.conf + +# This one includes other config files: + +include /etc/tgt/temp/*.conf + + +# Set the driver. If not specified, defaults to "iscsi". + +default-driver iscsi + + +# Continue if tgtadm exits with non-zero code (equivalent of +# --ignore-errors command line option) +#ignore-errors yes + + +# Sample target with one LUN only. Defaults to allow access for all initiators: + +<target iqn.2008-09.com.example:server.target1> + backing-store /dev/LVM/somedevice +</target> + + +# Similar, but we use "direct-store" instead of "backing-store". +# "direct-store" reads drive parameters with sg_inq command and sets them to +# the target. +# Parameters fatched with sg_inq are: +# - Vendor identification +# - Product identification +# - Product revision level +# - Unit serial number (if present) +# We also specify "incominguser". + +<target iqn.2008-09.com.example:server.target2> + direct-store /dev/sdd + incominguser someuser secretpass12 +</target> + + +# An example with multiple LUNs, disabled write-cache (tgtd enables write-cache +# by default) and vendor identification set to "MyVendor" + +<target iqn.2008-09.com.example:server.target3> + backing-store /dev/LVM/somedevice1 # Becomes LUN 1 + backing-store /dev/LVM/somedevice2 # Becomes LUN 2 + backing-store /dev/LVM/somedevice3 # Becomes LUN 3 + write-cache off + vendor_id MyCompany Inc. +</target> + + +# Similar to the one above, but we fetch vendor_id, product_id, product_rev and +# scsi_sn from the disks. +# Vendor identification (vendor_id) is replaced in all disks by "MyVendor" + +<target iqn.2008-09.com.example:server.target4> + direct-store /dev/sdb # Becomes LUN 1 + direct-store /dev/sdc # Becomes LUN 2 + direct-store /dev/sdd # Becomes LUN 3 + write-cache off + vendor_id MyCompany Inc. +</target> + + +# Note that "first-device-first-lun numbering" will work only for simple +# scenarios above, where _only_ direct-store _or_ backing-store is used. +# If you mix backing-store and direct-store, then all backing-store entries +# are processed before direct-store-entries. + +<target iqn.2008-09.com.example:server.target4> + direct-store /dev/sdb # Becomes LUN 3 + backing-store /dev/sdc # Becomes LUN 1 + direct-store /dev/sdd # Becomes LUN 4 + backing-store /dev/sde # Becomes LUN 2 +</target> + + +# Even more complicated example - each device has different parameters. +# You can use indentation to make the config file more readable. +# Note that LUNs will be assigned more or less randomly here (and still +# backing-store get LUNs assigned before drect-store). +# You can specify multiple mode_page parameters (they are commented out +# in this example). +# Note that some parameters (write-cache, scsi_sn) were specified "globally". +# "Global" parameters will be applied to all LUNs; they can be overwritten +# "locally", per LUN. +# If lun is not specified, it will be allocated automatically (first available). + +<target iqn.2008-09.com.example:server.target5> + + <direct-store /dev/sdd> + vendor_id VENDOR1 + removable 1 + device-type cd + lun 1 + </direct-store> + + <direct-store /dev/sda> + vendor_id VENDOR2 + lun 2 + </direct-store> + + <backing-store /dev/sdb1> + vendor_id back1 + scsi_sn SERIAL + write-cache on + # lun 3 # lun is commented out - will be allocated automatically + </backing-store> + + <backing-store /dev/sdd1> + vendor_id back2 + #mode_page 8:0:18:0x10:0:0xff.... + #mode_page 8:0:18:0x10:0:0xff.... + #bs-type aio + #params element_type=4,start_address=500,quantity=3,media_home=/root/tapes + #params element_type=4,address=500,tid=1,lun=1 + lun 15 + </backing-store> + + # Some more parameters which can be specified locally or globally: + #scsi_id ... + #scsi_sn ... + #vendor_id ... + #product_id ... + #product_rev ... + #sense_format ... + #removable ... + #online ... + #path ... + #mode_page 8:0:18:0x10:0:0xff.... + #mode_page 8:0:18:0x10:0:0xff.... + #device-type ... + #bs-type ... # backing store type - default rdwr, can be aio, mmap, etc... + #params element_type=4,start_address=500,quantity=3,media_home=/root/tapes + #params element_type=4,address=500,tid=1,lun=1 + #allow-in-use yes # if specified globally, can't be overwritten locally + + write-cache off + scsi_sn multipath-10 + + # Parameters below are only global. They can't be configured per LUN. + # Only allow connections from 192.168.100.1 and 192.168.200.5 + initiator-address 192.168.100.1 + initiator-address 192.168.200.5 + + # Tuning parameters (global, per target) + #MaxRecvDataSegmentLength 8192 + #MaxXmitDataSegmentLength 8192 + #HeaderDigest None + #DataDigest None + #InitialR2T Yes + #MaxOutstandingR2T 1 + #ImmediateData Yes + #FirstBurstLength 65536 + #MaxBurstLength 262144 + #DataPDUInOrder Yes + #DataSequenceInOrder Yes + #ErrorRecoveryLevel 0 + #IFMarker No + #OFMarker No + #DefaultTime2Wait 2 + #DefaultTime2Retain 20 + #OFMarkInt Reject + #IFMarkInt Reject + #MaxConnections 1 + + # Allowed incoming users + incominguser user1 secretpass12 + incominguser user2 secretpass23 + + # Outgoing user + outgoinguser userA secretpassA + +</target> + + +# The device will have lun 1 unless you specify something else +<target iqn.2008-09.com.example:server.target6> + backing-store /dev/LVM/somedevice + lun 10 +</target> + + +# Devices which are in use (by system: mounted, for swap, part of RAID, or by +# userspace: dd, by tgtd for another target etc.) can't be used, unless you use +# --force flag or add 'allow-in-use yes' option +<target iqn.2008-09.com.example:server.target7> + backing-store /dev/LVM/somedevice + allow-in-use yes +</target> + +<target iqn.2008-09.com.example:server.target8> + <backing-store /dev/LVM/somedevice> + scsi_sn serial1 + </backing-store> + + <backing-store /dev/LVM/somedevice2> + scsi_sn serial2 + </backing-store> + + allow-in-use yes +</target> + + + + + +# Not supported configurations, and therefore, commented out: + +#<target iqn.2008-09.com.example:server.target9> +# backing-store /dev/LVM/somedevice1 +# backing-store /dev/LVM/somedevice2 +# lun 10 +# lun 11 +#</target> + +#<target iqn.2008-09.com.example:server.target10> +# <direct-store /dev/sdd> +# vendor_id VENDOR1 +# </direct-store> +# +# direct-store /dev/sdc +#</target> + +# This one will break the parser: + +#<target iqn.2008-09.com.example:server.target11> +# <direct-store /dev/sdd> +# vendor_id VENDOR1 +# </direct-store> +# +# direct-store /dev/sdc +# +# <direct-store /dev/sdd> +# vendor_id VENDOR1 +# </direct-store> +#</target> diff --git a/doc/Makefile b/doc/Makefile index 4b22e0a..f7cdfd3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -4,8 +4,7 @@ docdir ?= $(PREFIX)/share/doc/tgt MANPAGES = manpages/tgtadm.8 manpages/tgt-admin.8 \ manpages/tgt-setup-lun.8 DOCS = README.fcoe README.ibmvstgt README.iscsi README.iser \ - README.lu_configuration README.mmc targets.conf.example \ - tmf.txt TODO + README.lu_configuration README.mmc tmf.txt .PHONY:all all: diff --git a/doc/targets.conf.example b/doc/targets.conf.example deleted file mode 100644 index 2f8020a..0000000 --- a/doc/targets.conf.example +++ /dev/null @@ -1,239 +0,0 @@ -# This is a sample config file for tgt-admin. -# By default, tgt-admin looks for its config file in /etc/tgt/targets.conf - -# This one includes other config files: - -include /etc/tgt/temp/*.conf - - -# Set the driver. If not specified, defaults to "iscsi". - -default-driver iscsi - - -# Continue if tgtadm exits with non-zero code (equivalent of -# --ignore-errors command line option) -#ignore-errors yes - - -# Sample target with one LUN only. Defaults to allow access for all initiators: - -<target iqn.2008-09.com.example:server.target1> - backing-store /dev/LVM/somedevice -</target> - - -# Similar, but we use "direct-store" instead of "backing-store". -# "direct-store" reads drive parameters with sg_inq command and sets them to -# the target. -# Parameters fatched with sg_inq are: -# - Vendor identification -# - Product identification -# - Product revision level -# - Unit serial number (if present) -# We also specify "incominguser". - -<target iqn.2008-09.com.example:server.target2> - direct-store /dev/sdd - incominguser someuser secretpass12 -</target> - - -# An example with multiple LUNs, disabled write-cache (tgtd enables write-cache -# by default) and vendor identification set to "MyVendor" - -<target iqn.2008-09.com.example:server.target3> - backing-store /dev/LVM/somedevice1 # Becomes LUN 1 - backing-store /dev/LVM/somedevice2 # Becomes LUN 2 - backing-store /dev/LVM/somedevice3 # Becomes LUN 3 - write-cache off - vendor_id MyCompany Inc. -</target> - - -# Similar to the one above, but we fetch vendor_id, product_id, product_rev and -# scsi_sn from the disks. -# Vendor identification (vendor_id) is replaced in all disks by "MyVendor" - -<target iqn.2008-09.com.example:server.target4> - direct-store /dev/sdb # Becomes LUN 1 - direct-store /dev/sdc # Becomes LUN 2 - direct-store /dev/sdd # Becomes LUN 3 - write-cache off - vendor_id MyCompany Inc. -</target> - - -# Note that "first-device-first-lun numbering" will work only for simple -# scenarios above, where _only_ direct-store _or_ backing-store is used. -# If you mix backing-store and direct-store, then all backing-store entries -# are processed before direct-store-entries. - -<target iqn.2008-09.com.example:server.target4> - direct-store /dev/sdb # Becomes LUN 3 - backing-store /dev/sdc # Becomes LUN 1 - direct-store /dev/sdd # Becomes LUN 4 - backing-store /dev/sde # Becomes LUN 2 -</target> - - -# Even more complicated example - each device has different parameters. -# You can use indentation to make the config file more readable. -# Note that LUNs will be assigned more or less randomly here (and still -# backing-store get LUNs assigned before drect-store). -# You can specify multiple mode_page parameters (they are commented out -# in this example). -# Note that some parameters (write-cache, scsi_sn) were specified "globally". -# "Global" parameters will be applied to all LUNs; they can be overwritten -# "locally", per LUN. -# If lun is not specified, it will be allocated automatically (first available). - -<target iqn.2008-09.com.example:server.target5> - - <direct-store /dev/sdd> - vendor_id VENDOR1 - removable 1 - device-type cd - lun 1 - </direct-store> - - <direct-store /dev/sda> - vendor_id VENDOR2 - lun 2 - </direct-store> - - <backing-store /dev/sdb1> - vendor_id back1 - scsi_sn SERIAL - write-cache on - # lun 3 # lun is commented out - will be allocated automatically - </backing-store> - - <backing-store /dev/sdd1> - vendor_id back2 - #mode_page 8:0:18:0x10:0:0xff.... - #mode_page 8:0:18:0x10:0:0xff.... - #bs-type aio - #params element_type=4,start_address=500,quantity=3,media_home=/root/tapes - #params element_type=4,address=500,tid=1,lun=1 - lun 15 - </backing-store> - - # Some more parameters which can be specified locally or globally: - #scsi_id ... - #scsi_sn ... - #vendor_id ... - #product_id ... - #product_rev ... - #sense_format ... - #removable ... - #online ... - #path ... - #mode_page 8:0:18:0x10:0:0xff.... - #mode_page 8:0:18:0x10:0:0xff.... - #device-type ... - #bs-type ... # backing store type - default rdwr, can be aio, mmap, etc... - #params element_type=4,start_address=500,quantity=3,media_home=/root/tapes - #params element_type=4,address=500,tid=1,lun=1 - #allow-in-use yes # if specified globally, can't be overwritten locally - - write-cache off - scsi_sn multipath-10 - - # Parameters below are only global. They can't be configured per LUN. - # Only allow connections from 192.168.100.1 and 192.168.200.5 - initiator-address 192.168.100.1 - initiator-address 192.168.200.5 - - # Tuning parameters (global, per target) - #MaxRecvDataSegmentLength 8192 - #MaxXmitDataSegmentLength 8192 - #HeaderDigest None - #DataDigest None - #InitialR2T Yes - #MaxOutstandingR2T 1 - #ImmediateData Yes - #FirstBurstLength 65536 - #MaxBurstLength 262144 - #DataPDUInOrder Yes - #DataSequenceInOrder Yes - #ErrorRecoveryLevel 0 - #IFMarker No - #OFMarker No - #DefaultTime2Wait 2 - #DefaultTime2Retain 20 - #OFMarkInt Reject - #IFMarkInt Reject - #MaxConnections 1 - - # Allowed incoming users - incominguser user1 secretpass12 - incominguser user2 secretpass23 - - # Outgoing user - outgoinguser userA secretpassA - -</target> - - -# The device will have lun 1 unless you specify something else -<target iqn.2008-09.com.example:server.target6> - backing-store /dev/LVM/somedevice - lun 10 -</target> - - -# Devices which are in use (by system: mounted, for swap, part of RAID, or by -# userspace: dd, by tgtd for another target etc.) can't be used, unless you use -# --force flag or add 'allow-in-use yes' option -<target iqn.2008-09.com.example:server.target7> - backing-store /dev/LVM/somedevice - allow-in-use yes -</target> - -<target iqn.2008-09.com.example:server.target8> - <backing-store /dev/LVM/somedevice> - scsi_sn serial1 - </backing-store> - - <backing-store /dev/LVM/somedevice2> - scsi_sn serial2 - </backing-store> - - allow-in-use yes -</target> - - - - - -# Not supported configurations, and therefore, commented out: - -#<target iqn.2008-09.com.example:server.target9> -# backing-store /dev/LVM/somedevice1 -# backing-store /dev/LVM/somedevice2 -# lun 10 -# lun 11 -#</target> - -#<target iqn.2008-09.com.example:server.target10> -# <direct-store /dev/sdd> -# vendor_id VENDOR1 -# </direct-store> -# -# direct-store /dev/sdc -#</target> - -# This one will break the parser: - -#<target iqn.2008-09.com.example:server.target11> -# <direct-store /dev/sdd> -# vendor_id VENDOR1 -# </direct-store> -# -# direct-store /dev/sdc -# -# <direct-store /dev/sdd> -# vendor_id VENDOR1 -# </direct-store> -#</target> -- 1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe stgt" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
