From c4979712bd5968ab102d898a484f0ef10f191fc3 Mon Sep 17 00:00:00 2001 From: Travis Glenn Hansen Date: Tue, 12 Jan 2021 09:56:03 -0700 Subject: [PATCH] fix iscsiName logic to support template configuration in zfs-generic delete share --- src/driver/controller-zfs-generic/index.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/driver/controller-zfs-generic/index.js b/src/driver/controller-zfs-generic/index.js index 2cb0810..0f20336 100644 --- a/src/driver/controller-zfs-generic/index.js +++ b/src/driver/controller-zfs-generic/index.js @@ -198,7 +198,17 @@ create /backstores/block/${iscsiName} case "zfs-generic-iscsi": let basename; - let iscsiName = zb.helpers.extractLeafName(datasetName); + let iscsiName; + + if (this.options.iscsi.nameTemplate) { + iscsiName = Handlebars.compile(this.options.iscsi.nameTemplate)({ + name: call.request.name, + parameters: call.request.parameters, + }); + } else { + iscsiName = zb.helpers.extractLeafName(datasetName); + } + if (this.options.iscsi.namePrefix) { iscsiName = this.options.iscsi.namePrefix + iscsiName; }