|
 |
e4ffb1 |
diff -uNr a/fence/agents/mpath/fence_mpath.py b/fence/agents/mpath/fence_mpath.py
|
|
|
e4ffb1 |
--- a/fence/agents/mpath/fence_mpath.py 2016-05-25 12:41:55.491900397 +0200
|
|
|
e4ffb1 |
+++ b/fence/agents/mpath/fence_mpath.py 2016-05-25 12:42:37.704454037 +0200
|
|
|
e4ffb1 |
@@ -169,7 +169,7 @@
|
|
|
e4ffb1 |
"help" : "-d, --devices=[devices] List of devices to use for current operation",
|
|
|
e4ffb1 |
"required" : "0",
|
|
|
e4ffb1 |
"shortdesc" : "List of devices to use for current operation. Devices can \
|
|
|
e4ffb1 |
-be comma-separated list of device-mapper multipath devices (eg. /dev/dm-3). \
|
|
|
e4ffb1 |
+be comma-separated list of device-mapper multipath devices (eg. /dev/mapper/3600508b400105df70000e00000ac0000 or /dev/mapper/mpath1). \
|
|
|
e4ffb1 |
Each device must support SCSI-3 persistent reservations.",
|
|
|
e4ffb1 |
"order": 1
|
|
|
e4ffb1 |
}
|
|
|
e4ffb1 |
diff -uNr a/fence/agents/scsi/fence_scsi.py b/fence/agents/scsi/fence_scsi.py
|
|
|
e4ffb1 |
--- a/fence/agents/scsi/fence_scsi.py 2016-05-25 12:41:55.517900122 +0200
|
|
|
e4ffb1 |
+++ b/fence/agents/scsi/fence_scsi.py 2016-05-25 12:42:37.704454037 +0200
|
|
|
e4ffb1 |
@@ -291,8 +291,8 @@
|
|
|
e4ffb1 |
"help" : "-d, --devices=[devices] List of devices to use for current operation",
|
|
|
e4ffb1 |
"required" : "0",
|
|
|
e4ffb1 |
"shortdesc" : "List of devices to use for current operation. Devices can \
|
|
|
e4ffb1 |
-be comma-separated list of raw device (eg. /dev/sdc) or device-mapper multipath \
|
|
|
e4ffb1 |
-devices (eg. /dev/dm-3). Each device must support SCSI-3 persistent reservations.",
|
|
|
e4ffb1 |
+be comma-separated list of raw devices (eg. /dev/sdc). Each device must support SCSI-3 \
|
|
|
e4ffb1 |
+persistent reservations.",
|
|
|
e4ffb1 |
"order": 1
|
|
|
e4ffb1 |
}
|
|
|
e4ffb1 |
all_opt["nodename"] = {
|
|
|
e4ffb1 |
diff -uNr a/tests/data/metadata/fence_mpath.xml b/tests/data/metadata/fence_mpath.xml
|
|
|
e4ffb1 |
--- a/tests/data/metadata/fence_mpath.xml 2016-05-25 12:41:55.486900450 +0200
|
|
|
e4ffb1 |
+++ b/tests/data/metadata/fence_mpath.xml 2016-05-25 12:42:37.704454037 +0200
|
|
|
e4ffb1 |
@@ -7,7 +7,7 @@
|
|
|
e4ffb1 |
<parameter name="devices" unique="0" required="0">
|
|
|
e4ffb1 |
<getopt mixed="-d, --devices=[devices]" />
|
|
|
e4ffb1 |
<content type="string" />
|
|
|
e4ffb1 |
- <shortdesc lang="en">List of devices to use for current operation. Devices can be comma-separated list of device-mapper multipath devices (eg. /dev/dm-3). Each device must support SCSI-3 persistent reservations.</shortdesc>
|
|
|
e4ffb1 |
+ <shortdesc lang="en">List of devices to use for current operation. Devices can be comma-separated list of device-mapper multipath devices (eg. /dev/mapper/3600508b400105df70000e00000ac0000 or /dev/mapper/mpath1). Each device must support SCSI-3 persistent reservations.</shortdesc>
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="key" unique="0" required="1">
|
|
|
e4ffb1 |
<getopt mixed="-k, --key=[key]" />
|
|
|
e4ffb1 |
diff -uNr a/tests/data/metadata/fence_scsi.xml b/tests/data/metadata/fence_scsi.xml
|
|
|
e4ffb1 |
--- a/tests/data/metadata/fence_scsi.xml 2016-05-25 12:41:55.517900122 +0200
|
|
|
e4ffb1 |
+++ b/tests/data/metadata/fence_scsi.xml 2016-05-25 12:42:37.704454037 +0200
|
|
|
e4ffb1 |
@@ -27,7 +27,7 @@
|
|
|
e4ffb1 |
<parameter name="devices" unique="0" required="0">
|
|
|
e4ffb1 |
<getopt mixed="-d, --devices=[devices]" />
|
|
|
e4ffb1 |
<content type="string" />
|
|
|
e4ffb1 |
- <shortdesc lang="en">List of devices to use for current operation. Devices can be comma-separated list of raw device (eg. /dev/sdc) or device-mapper multipath devices (eg. /dev/dm-3). Each device must support SCSI-3 persistent reservations.</shortdesc>
|
|
|
e4ffb1 |
+ <shortdesc lang="en">List of devices to use for current operation. Devices can be comma-separated list of raw devices (eg. /dev/sdc). Each device must support SCSI-3 persistent reservations.</shortdesc>
|
|
|
e4ffb1 |
</parameter>
|
|
|
e4ffb1 |
<parameter name="logfile" unique="0" required="0">
|
|
|
e4ffb1 |
<getopt mixed="-a, --logfile" />
|