hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-08-31 12:25:21 +03:00
parent 0afcfd7719 b2fea99dbc
commit 77926bb999
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
maxscale-system-test/mdbci/set_env.sh
View File

@ -80,15 +80,19 @@ do
done
done
export maxscale_access_user=$maxscale_000_whoami
export maxscale_access_sudo="sudo "
# IP Of MaxScale machine
export maxscale_network=$maxscale_000_network
export maxscale_keyfile=$maxscale_000_keyfile
export maxscale_IP=$maxscale_000_network
export maxscale_sshkey=$maxscale_000_keyfile
if [ ${maxscale_N} -gt 1 ] ; then
export maxscale_whoami=$maxscale_000_whoami
export maxscale_network=$maxscale_000_network
export maxscale_keyfile=$maxscale_000_keyfile
export maxscale_sshkey=$maxscale_000_keyfile
fi
export maxscale_IP=$maxscale_network
export maxscale_access_user=$maxscale_whoami
# Sysbench directory (should be sysbench >= 0.5)
export sysbench_dir=${sysbench_dir:-"$HOME/sysbench_deb7/sysbench/"}