Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "cleanup: rm node_ID from yardstick prepare_env file"
[yardstick.git]
/
tests
/
ci
/
prepare_env.sh
diff --git
a/tests/ci/prepare_env.sh
b/tests/ci/prepare_env.sh
index
44e2694
..
caef8ac
100755
(executable)
--- a/
tests/ci/prepare_env.sh
+++ b/
tests/ci/prepare_env.sh
@@
-14,6
+14,8
@@
: ${INSTALLER_TYPE:='unknown'}
: ${NODE_NAME:='unknown'}
: ${EXTERNAL_NETWORK:='admin_floating_net'}
: ${INSTALLER_TYPE:='unknown'}
: ${NODE_NAME:='unknown'}
: ${EXTERNAL_NETWORK:='admin_floating_net'}
+: ${USER_NAME:='ubuntu'}
+: ${SSH_KEY:='/root/.ssh/id_rsa'}
# Extract network name from EXTERNAL_NETWORK
# e.g. EXTERNAL_NETWORK='ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24'
# Extract network name from EXTERNAL_NETWORK
# e.g. EXTERNAL_NETWORK='ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24'
@@
-83,34
+85,36
@@
verify_connectivity() {
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
if [ "$INSTALLER_TYPE" == "fuel" ]; then
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
if [ "$INSTALLER_TYPE" == "fuel" ]; then
- #ip_fuel="10.20.0.2"
+
+ # check the connection
verify_connectivity $INSTALLER_IP
verify_connectivity $INSTALLER_IP
+ pod_yaml="$YARDSTICK_REPO_DIR/etc/yardstick/nodes/fuel_baremetal/pod.yaml"
+
+ # update "ip" according to the CI env
ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
"sudo salt -C 'ctl* or cmp*' grains.get fqdn_ip4 --out yaml">node_info
ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
"sudo salt -C 'ctl* or cmp*' grains.get fqdn_ip4 --out yaml">node_info
- # update node ip info according to the CI env
controller_ips=($(cat node_info|awk '/ctl/{getline; print $2}'))
compute_ips=($(cat node_info|awk '/cmp/{getline; print $2}'))
controller_ips=($(cat node_info|awk '/ctl/{getline; print $2}'))
compute_ips=($(cat node_info|awk '/cmp/{getline; print $2}'))
- pod_yaml="./etc/yardstick/nodes/fuel_baremetal/pod.yaml"
- node_line_num=($(grep -n node[1-5] $pod_yaml | awk -F: '{print $1}'))
- node_ID=0;
-
if [[ ${controller_ips[0]} ]]; then
if [[ ${controller_ips[0]} ]]; then
- sed -i "
${node_line_num[0]}s/node1/node$((++node_ID))/;s/ip1/${controller_ips[0]}/
" $pod_yaml;
+ sed -i "
s|ip1|${controller_ips[0]}|
" $pod_yaml;
fi
if [[ ${controller_ips[1]} ]]; then
fi
if [[ ${controller_ips[1]} ]]; then
- sed -i "
${node_line_num[1]}s/node2/node$((++node_ID))/;s/ip2/${controller_ips[1]}/
" $pod_yaml;
+ sed -i "
s|ip2|${controller_ips[1]}|
" $pod_yaml;
fi
if [[ ${controller_ips[2]} ]]; then
fi
if [[ ${controller_ips[2]} ]]; then
- sed -i "
${node_line_num[2]}s/node3/node$((++node_ID))/;s/ip3/${controller_ips[2]}/
" $pod_yaml;
+ sed -i "
s|ip3|${controller_ips[2]}|
" $pod_yaml;
fi
if [[ ${compute_ips[0]} ]]; then
fi
if [[ ${compute_ips[0]} ]]; then
- sed -i "
${node_line_num[3]}s/node4/node$((++node_ID))/;s/ip4/${compute_ips[0]}/
" $pod_yaml;
+ sed -i "
s|ip4|${compute_ips[0]}|
" $pod_yaml;
fi
if [[ ${compute_ips[1]} ]]; then
fi
if [[ ${compute_ips[1]} ]]; then
- sed -i "
${node_line_num[4]}s/node5/node$((++node_ID))/;s/ip5/${compute_ips[1]}/
" $pod_yaml;
+ sed -i "
s|ip5|${compute_ips[1]}|
" $pod_yaml;
fi
fi
+ # update 'user' and 'key_filename' according to the CI env
+ sed -i "s|node_username|${USER_NAME}|;s|node_keyfile|${SSH_KEY}|" $pod_yaml;
+
fi
fi