Merge pull request ClusterLabs#273 from oalbrigt/fence_scsi-detect-no…

…deid-new-format

fence_scsi: detect node ID using new format, and fallback to old format before failing

agents/scsi/fence_scsi.py

@@ -192,8 +192,14 @@ def get_cluster_id(options):
 
 def get_node_id(options):
 	cmd = options["--corosync-cmap-path"] + " nodelist"
+	out = run_cmd(options, cmd)["out"]
+
+	match = re.search(r".(\d+).name \(str\) = " + options["--plug"] + "\n", out)
+
+	# try old format before failing
+	if not match:
+		match = re.search(r".(\d+).ring._addr \(str\) = " + options["--plug"] + "\n", out)
 
-	match = re.search(r".(\d+).ring._addr \(str\) = " + options["--plug"] + "\n", run_cmd(options, cmd)["out"])
 	return match.group(1) if match else fail_usage("Failed: unable to parse output of corosync-cmapctl or node does not exist")