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

remove iscsiDirHostPathCheckDirectory and replace it with iscsiDirHostType

This commit is contained in:
5cat 2022-08-06 22:27:49 +08:00
parent f4a8e14f33
commit 716df8fdd0
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -170,7 +170,7 @@ node:
- name: ISCSIADM_HOST_PATH - name: ISCSIADM_HOST_PATH
value: /usr/local/sbin/iscsiadm value: /usr/local/sbin/iscsiadm
iscsiDirHostPath: /usr/local/etc/iscsi iscsiDirHostPath: /usr/local/etc/iscsi
iscsiDirHostPathCheckDirectory: false iscsiDirHostType: ""
``` ```
and continue your democratic installation as usuall with other iscsi drivers. and continue your democratic installation as usuall with other iscsi drivers.

7
docker/iscsiadm
View File

@ -1,12 +1,7 @@
#!/bin/bash #!/bin/bash
set -e
set -x
iscsiadm_host_strategy=$([ $ISCSIADM_HOST_STRATEGY ] && echo $ISCSIADM_HOST_STRATEGY || echo "chroot") iscsiadm_host_strategy=$([ $ISCSIADM_HOST_STRATEGY ] && echo $ISCSIADM_HOST_STRATEGY || echo "chroot")
iscsiadm_host_path=$( [ $ISCSIADM_HOST_PATH ] && echo $ISCSIADM_HOST_PATH || echo "/sbin/iscsiadm") 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 case $iscsiadm_host_strategy in
chroot) chroot)
@ -18,14 +13,12 @@ case $iscsiadm_host_strategy in
# https://github.com/siderolabs/extensions/issues/38#issuecomment-1125403043 # https://github.com/siderolabs/extensions/issues/38#issuecomment-1125403043
iscsid_pid=$(for proc in /proc/*/cmdline; do grep -q "iscsid -f" <<< $(cat $proc 2>/dev/null | tr "\0" " ") && echo $(basename $(dirname $proc)) && break; done) iscsid_pid=$(for proc in /proc/*/cmdline; do grep -q "iscsid -f" <<< $(cat $proc 2>/dev/null | tr "\0" " ") && echo $(basename $(dirname $proc)) && break; done)
if [ "$iscsid_pid" = "" ]; then if [ "$iscsid_pid" = "" ]; then
echo "could not find the iscsid process"
exit 1 exit 1
fi fi
nsenter --mount="/proc/${iscsid_pid}/ns/mnt" --net="/proc/${iscsid_pid}/ns/net" -- $iscsiadm_host_path "${@:1}" nsenter --mount="/proc/${iscsid_pid}/ns/mnt" --net="/proc/${iscsid_pid}/ns/net" -- $iscsiadm_host_path "${@:1}"
;; ;;
*) *)
echo "$iscsiadm_host_strategy is not a valid strategy, choose either 'chroot' or 'nsenter'"
exit 1 exit 1
;; ;;
esac esac