Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add & fix licensing in README.rst files, align ext"
[fuel.git]
/
mcp
/
scripts
/
lib.sh
diff --git
a/mcp/scripts/lib.sh
b/mcp/scripts/lib.sh
index
1812663
..
e123e52
100644
(file)
--- a/
mcp/scripts/lib.sh
+++ b/
mcp/scripts/lib.sh
@@
-17,7
+17,7
@@
generate_ssh_key() {
fi
[ -f "${mcp_ssh_key}" ] || ssh-keygen -f "${mcp_ssh_key}" -N ''
fi
[ -f "${mcp_ssh_key}" ] || ssh-keygen -f "${mcp_ssh_key}" -N ''
- install -D -o "${user}" -m 0600 "${mcp_ssh_key}" "${SSH_KEY}"
+
sudo
install -D -o "${user}" -m 0600 "${mcp_ssh_key}" "${SSH_KEY}"
}
get_base_image() {
}
get_base_image() {
@@
-34,7
+34,9
@@
cleanup_vms() {
virsh destroy "${node}"
done
for node in $(virsh list --name --all | grep -P '\w{3}\d{2}'); do
virsh destroy "${node}"
done
for node in $(virsh list --name --all | grep -P '\w{3}\d{2}'); do
- virsh undefine --nvram "${node}"
+ virsh domblklist "${node}" | awk '/^.da/ {print $2}' | \
+ xargs --no-run-if-empty -I{} sudo rm -f {}
+ virsh undefine "${node}" --remove-all-storage --nvram
done
}
done
}
@@
-45,6
+47,7
@@
prepare_vms() {
cleanup_vms
get_base_image "${base_image}" "${image_dir}"
cleanup_vms
get_base_image "${base_image}" "${image_dir}"
+ # shellcheck disable=SC2016
envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \
user-data.template > user-data.sh
envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \
user-data.template > user-data.sh
@@
-138,7
+141,7
@@
start_vms() {
# start vms
for node in "${vnodes[@]}"; do
virsh start "${node}"
# start vms
for node in "${vnodes[@]}"; do
virsh start "${node}"
- sleep $
[RANDOM%5+1]
+ sleep $
((RANDOM%5+1))
done
}
done
}