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

adding ISCSIADM_HOST_PATH to iscisadm

This commit is contained in:
5cat 2022-08-06 04:06:58 +08:00
parent c0b8590e1b
commit f4a8e14f33
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -167,6 +167,8 @@ node:
extraEnv:
- name: ISCSIADM_HOST_STRATEGY
value: nsenter
- name: ISCSIADM_HOST_PATH
value: /usr/local/sbin/iscsiadm
iscsiDirHostPath: /usr/local/etc/iscsi
iscsiDirHostPathCheckDirectory: false
```

9
docker/iscsiadm
View File

@ -1,9 +1,12 @@
#!/bin/bash
set -e
set -x
iscsiadm_host_strategy=$([ $ISCSIADM_HOST_STRATEGY ] && echo $ISCSIADM_HOST_STRATEGY || echo "chroot")
echo "using $iscsiadm_host_strategy strategy"
iscsiadm_host_path=$( [ $ISCSIADM_HOST_PATH ] && echo $ISCSIADM_HOST_PATH || echo "/sbin/iscsiadm")
echo "using iscsiadm_host_strategy=$iscsiadm_host_strategy"
echo "using iscsiadm_host_path=$iscsiadm_host_path"
case $iscsiadm_host_strategy in
chroot)
@ -18,7 +21,7 @@ case $iscsiadm_host_strategy in
echo "could not find the iscsid process"
exit 1
fi
nsenter --mount="/proc/${iscsid_pid}/ns/mnt" --net="/proc/${iscsid_pid}/ns/net" -- /usr/local/sbin/iscsiadm "${@:1}"
nsenter --mount="/proc/${iscsid_pid}/ns/mnt" --net="/proc/${iscsid_pid}/ns/net" -- $iscsiadm_host_path "${@:1}"
;;
*)