LU-16708 tests: fix zconf_mount_clients for SSK

When SHARED_KEY is in use, zconf_mount_clients can add 'skpath' mount
option to load nodemap-specific keys. But this must not overwrite
already specified mount options.

Fixes: 05e5cb0b0c ("LU-16683 tests: fix sanity-sec test_61 for SSK")
Test-Parameters: trivial
Test-Parameters: testlist=sanity-sec env=ONLY=61
Test-Parameters: testlist=sanity-sec env=SHARED_KEY=true,ONLY=61
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I3dbc6ffe72722659ead77fb1c2c2675873c7aff2
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50523
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 65ab2cd..92a124e 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2604,7 +2604,7 @@ zconf_mount_clients() {
                                fi
                                do_node $nmclient "! grep -q $mnt' ' \
                                        /proc/mounts || umount $mnt"
-                               local prunedopts=$(add_sk_mntflag $prunedopts);
+                               local prunedopts=$(add_sk_mntflag $opts);
                                prunedopts=$(echo $prunedopts | sed -e \
                                        "s#skpath=[^ ^,]*#skpath=$mountkey#g")
                                set -x