public_git
/
democratic-csi
mirror of https://github.com/democratic-csi/democratic-csi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

better handling if missing targetPortal config value 

Signed-off-by: Travis Glenn Hansen <travisghansen@yahoo.com>
This commit is contained in:
Travis Glenn Hansen 2021-06-15 16:50:09 -06:00
parent 8b6e12dd77
commit ad40b6a1ef
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/driver/controller-zfs-generic/index.js
View File

@ -47,8 +47,9 @@ class ControllerZfsGenericDriver extends ControllerZfsSshBaseDriver {
]
) {
await zb.zfs.set(datasetName, {
[key]: this.options.nfs.shareStrategySetDatasetProperties
.properties[key],
[key]:
this.options.nfs.shareStrategySetDatasetProperties
.properties[key],
});
}
}
@ -114,8 +115,10 @@ class ControllerZfsGenericDriver extends ControllerZfsSshBaseDriver {
if (this.options.iscsi.shareStrategyTargetCli.tpg.attributes) {
for (const attributeName in this.options.iscsi
.shareStrategyTargetCli.tpg.attributes) {
const attributeValue = this.options.iscsi
.shareStrategyTargetCli.tpg.attributes[attributeName];
const attributeValue =
this.options.iscsi.shareStrategyTargetCli.tpg.attributes[
attributeName
];
setAttributesText += "\n";
setAttributesText += `set attribute ${attributeName}=${attributeValue}`;
}
@ -124,8 +127,10 @@ class ControllerZfsGenericDriver extends ControllerZfsSshBaseDriver {
if (this.options.iscsi.shareStrategyTargetCli.tpg.auth) {
for (const attributeName in this.options.iscsi
.shareStrategyTargetCli.tpg.auth) {
const attributeValue = this.options.iscsi
.shareStrategyTargetCli.tpg.auth[attributeName];
const attributeValue =
this.options.iscsi.shareStrategyTargetCli.tpg.auth[
attributeName
];
setAttributesText += "\n";
setAttributesText += `set auth ${attributeName}=${attributeValue}`;
}
@ -168,11 +173,11 @@ create /backstores/block/${iscsiName}
volume_context = {
node_attach_driver: "iscsi",
portal: this.options.iscsi.targetPortal,
portal: this.options.iscsi.targetPortal || "",
portals: this.options.iscsi.targetPortals
? this.options.iscsi.targetPortals.join(",")
: "",
interface: this.options.iscsi.interface,
interface: this.options.iscsi.interface || "",
iqn: iqn,
lun: 0,
};

2
src/driver/freenas/ssh.js
View File

@ -1234,7 +1234,7 @@ class FreeNASDriver extends ControllerZfsSshBaseDriver {
volume_context = {
node_attach_driver: "iscsi",
portal: this.options.iscsi.targetPortal,
portal: this.options.iscsi.targetPortal || "",
portals: this.options.iscsi.targetPortals
? this.options.iscsi.targetPortals.join(",")
: "",