public_git/democratic-csi
1
0
Fork 0
mirror of https://github.com/democratic-csi/democratic-csi.git synced 2026-10-19 01:54:10 +02:00
Code Issues Projects Releases Wiki Activity

support templates for nfs share comment

Browse Source 
Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen
2021-09-08 13:26:26 -06:00
parent a008f4f2ba
commit ccc5ea206d
7 changed files with 85 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/driver/freenas/api.js
+21 -2
View File
@@ -196,6 +196,25 @@ class FreeNASApiDriver extends CsiBaseDriver {
properties[FREENAS_NFS_SHARE_PROPERTY_NAME].value
)
) {
let nfsShareComment;
if (this.options.nfs.shareCommentTemplate) {
nfsShareComment = Handlebars.compile(
this.options.nfs.shareCommentTemplate
)({
name: call.request.name,
parameters: call.request.parameters,
csi: {
name: this.ctx.args.csiName,
version: this.ctx.args.csiVersion,
},
zfs: {
datasetName: datasetName,
},
});
} else {
nfsShareComment = `democratic-csi (${this.ctx.args.csiName}): ${datasetName}`;
}
switch (apiVersion) {
case 1:
case 2:
@@ -203,7 +222,7 @@ class FreeNASApiDriver extends CsiBaseDriver {
case 1:
share = {
nfs_paths: [properties.mountpoint.value],
nfs_comment: `democratic-csi (${this.ctx.args.csiName}): ${datasetName}`,
nfs_comment: nfsShareComment || "",
nfs_network:
this.options.nfs.shareAllowedNetworks.join(","),
nfs_hosts: this.options.nfs.shareAllowedHosts.join(","),
@@ -220,7 +239,7 @@ class FreeNASApiDriver extends CsiBaseDriver {
case 2:
share = {
paths: [properties.mountpoint.value],
comment: `democratic-csi (${this.ctx.args.csiName}): ${datasetName}`,
comment: nfsShareComment || "",
networks: this.options.nfs.shareAllowedNetworks,
hosts: this.options.nfs.shareAllowedHosts,
alldirs: this.options.nfs.shareAlldirs,
src/driver/freenas/ssh.js
+22 -3
View File
@@ -193,6 +193,25 @@ class FreeNASSshDriver extends ControllerZfsSshBaseDriver {
properties[FREENAS_NFS_SHARE_PROPERTY_NAME].value
)
) {
let nfsShareComment;
if (this.options.nfs.shareCommentTemplate) {
nfsShareComment = Handlebars.compile(
this.options.nfs.shareCommentTemplate
)({
name: call.request.name,
parameters: call.request.parameters,
csi: {
name: this.ctx.args.csiName,
version: this.ctx.args.csiVersion,
},
zfs: {
datasetName: datasetName,
},
});
} else {
nfsShareComment = `democratic-csi (${this.ctx.args.csiName}): ${datasetName}`;
}
switch (apiVersion) {
case 1:
case 2:
@@ -200,7 +219,7 @@ class FreeNASSshDriver extends ControllerZfsSshBaseDriver {
case 1:
share = {
nfs_paths: [properties.mountpoint.value],
nfs_comment: `democratic-csi (${this.ctx.args.csiName}): ${datasetName}`,
nfs_comment: nfsShareComment || "",
nfs_network:
this.options.nfs.shareAllowedNetworks.join(","),
nfs_hosts: this.options.nfs.shareAllowedHosts.join(","),
@@ -217,7 +236,7 @@ class FreeNASSshDriver extends ControllerZfsSshBaseDriver {
case 2:
share = {
paths: [properties.mountpoint.value],
comment: `democratic-csi (${this.ctx.args.csiName}): ${datasetName}`,
comment: nfsShareComment || "",
networks: this.options.nfs.shareAllowedNetworks,
hosts: this.options.nfs.shareAllowedHosts,
alldirs: this.options.nfs.shareAlldirs,
@@ -1629,7 +1648,7 @@ class FreeNASSshDriver extends ControllerZfsSshBaseDriver {
*
* scstadmin -resync_dev ${iscsiName}
* works but always give a exit code of 1 ^
*
*
* midclt resync_lun_size_for_zvol tank/foo/bar
* works on SCALE only ^
*/