export get_cfg
get_cloud_cfg() {
- if [ -z $1 ]; then
+ if [ -z "$1" ]; then
>&2 echo "Usage: get_cloud_cfg CFG_DIR"
exit 1
fi
}
get_launcher_factory() {
- if [ -z $1 ]; then
+ if [ -z "$1" ]; then
>&2 echo "Usage: get_launcher_factory JNLP|SSH"
exit 1
fi
}
get_minion_options() {
- if [ -z $1 ]; then
+ if [ -z "$1" ]; then
>&2 echo "Usage: get_minion_options CFG_FILE"
exit 1
fi
# Fails on first instance of each different associatve array prefix
# Fails when using single/double/no quotes, all of which are valid bash
# shellcheck disable=SC2154
+ flavors["acumos-highcpu-4-avx"]="c720c1f8-62e9-4695-823d-f7f54db46c86"
flavors["lf-highcpu-2"]="1051d06a-61ea-45e3-b9b4-93de92880b27"
flavors["lf-highcpu-4"]="35eb8e11-490f-4d1a-9f19-76091fc04547"
flavors["lf-highcpu-8"]="68af673f-54ee-4255-871c-158c18e4f643"
hardware_id=$(get_cfg "$cfg_file" HARDWARE_ID "")
network_id=$(get_cfg "$cfg_file" NETWORK_ID "")
- udi_default="$(get_cfg "$(dirname $cfg_file)/cloud.cfg" USER_DATA_ID "jenkins-init-script")"
+ udi_default="$(get_cfg "$(dirname "$cfg_file")/cloud.cfg" USER_DATA_ID "jenkins-init-script")"
user_data_id=$(get_cfg "$cfg_file" USER_DATA_ID "$udi_default")
# Handle Sandbox systems that might have a different cap.
availability_zone=$(get_cfg "$cfg_file" AVAILABILITY_ZONE "")
start_timeout=$(get_cfg "$cfg_file" START_TIMEOUT "600000")
- kpn_default="$(get_cfg "$(dirname $cfg_file)/cloud.cfg" KEY_PAIR_NAME "jenkins-ssh")"
+ kpn_default="$(get_cfg "$(dirname "$cfg_file")/cloud.cfg" KEY_PAIR_NAME "jenkins-ssh")"
key_pair_name=$(get_cfg "$cfg_file" KEY_PAIR_NAME "$kpn_default")
num_executors=$(get_cfg "$cfg_file" NUM_EXECUTORS "1")
| grep -i 'OpenStack Cloud Plugin' \
| awk -F':' '{print $2}' | awk -F' ' '{print $1}')"
if version_ge "$OS_PLUGIN_VER" "2.35"; then
- if [ ! -z "$volume_size" ]; then
+ if [ -n "$volume_size" ]; then
echo " new BootSource.VolumeFromImage(\"$image_name\", $volume_size),"
else
echo " new BootSource.Image(\"$image_name\"),"
echo " $retention_time"
else # SlaveOptions() structure for versions <= 2.34
- if [ ! -z "$volume_size" ]; then
+ if [ -n "$volume_size" ]; then
echo " new BootSource.VolumeFromImage(\"$image_name\", $volume_size),"
else
echo " new BootSource.Image(\"$image_name\"),"
}
get_template_cfg() {
- if [ -z $2 ]; then
+ if [ -z "$2" ]; then
>&2 echo "Usage: get_template_cfg CFG_FILE SILO [MINION_PREFIX]"
exit 1
fi
local minion_prefix="${3:-}"
- template_name=$(basename $cfg_file .cfg)
+ template_name=$(basename "$cfg_file" .cfg)
labels=$(get_cfg "$cfg_file" LABELS "")
echo "minion_options = new SlaveOptions("
echo ")"
}
-mapfile -t clouds < <(ls -d1 $OS_CLOUD_DIR/*/)
+mapfile -t clouds < <(ls -d1 "$OS_CLOUD_DIR"/*/)
for silo in $silos; do
for cloud in "${clouds[@]}"; do
cfg_dir="${cloud}"
echo "Processing $cfg_dir"
- insert_file="$SCRIPT_DIR/$silo/$(basename $cloud)/cloud-cfg.txt"
- mkdir -p "$(dirname $insert_file)"
+ insert_file="$SCRIPT_DIR/$silo/$(basename "$cloud")/cloud-cfg.txt"
+ mkdir -p "$(dirname "$insert_file")"
rm -f "$insert_file"
echo "" >> "$insert_file"
echo "//////////////////////////////////////////////////" >> "$insert_file"
- echo "// Cloud config for $(basename $cloud)" >> "$insert_file"
+ echo "// Cloud config for $(basename "$cloud")" >> "$insert_file"
echo "//////////////////////////////////////////////////" >> "$insert_file"
echo "" >> "$insert_file"
- echo "templates = []" >> $insert_file
- mapfile -t templates < <(find $cfg_dir -maxdepth 1 -not -type d -not -name "cloud.cfg")
+ echo "templates = []" >> "$insert_file"
+ mapfile -t templates < <(find "$cfg_dir" -maxdepth 1 -not -type d -not -name "cloud.cfg")
for template in "${templates[@]}"; do
get_template_cfg "$template" "$silo" "$node_prefix" >> "$insert_file"
echo "templates.add(template)" >> "$insert_file"