Skip to content

Commit 239cbbe

Browse files
committed
Refactor ansible-playbook command construction for improved readability
1 parent 78a64a2 commit 239cbbe

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

scripts/sap_automation_qa.sh

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,7 @@ run_ansible_playbook() {
377377
if [[ "$OFFLINE_MODE" == "true" ]]; then
378378
log "INFO" "Offline mode: Skipping SSH authentication setup"
379379
command="ansible-playbook ${cmd_dir}/../src/$playbook_name.yml -i $system_hosts \
380-
-e @$VARS_FILE -e @$system_params -e '_workspace_directory=$system_config_folder' \
381-
-e $extra_vars --connection=local"
380+
-e @$VARS_FILE -e @$system_params -e '_workspace_directory=$system_config_folder' $extra_vars --connection=local"
382381
else
383382
# Set local secret_id and key_vault_id if defined
384383
local secret_id=$(grep "^secret_id:" "$system_params" | awk '{split($0,a,": "); print a[2]}' | xargs || true)
@@ -402,8 +401,7 @@ run_ansible_playbook() {
402401
check_file_exists "$temp_file" \
403402
"Temporary SSH key file not found. Please check the Key Vault secret ID."
404403
command="ansible-playbook ${cmd_dir}/../src/$playbook_name.yml -i $system_hosts --private-key $temp_file \
405-
-e @$VARS_FILE -e @$system_params -e '_workspace_directory=$system_config_folder' \
406-
-e $extra_vars"
404+
-e @$VARS_FILE -e @$system_params -e '_workspace_directory=$system_config_folder' $extra_vars"
407405
else
408406
local ssh_key_dir="${cmd_dir}/../WORKSPACES/SYSTEM/$SYSTEM_CONFIG_NAME"
409407
local ssh_key=""
@@ -435,8 +433,7 @@ run_ansible_playbook() {
435433

436434
chmod 600 "$ssh_key"
437435
command="ansible-playbook ${cmd_dir}/../src/$playbook_name.yml -i $system_hosts --private-key $ssh_key \
438-
-e @$VARS_FILE -e @$system_params -e '_workspace_directory=$system_config_folder' \
439-
-e $extra_vars"
436+
-e @$VARS_FILE -e @$system_params -e '_workspace_directory=$system_config_folder' $extra_vars"
440437
fi
441438

442439
elif [[ "$auth_type" == "VMPASSWORD" ]]; then
@@ -450,14 +447,14 @@ run_ansible_playbook() {
450447
"Temporary password file not found. Please check the Key Vault secret ID."
451448
command="ansible-playbook ${cmd_dir}/../src/$playbook_name.yml -i $system_hosts \
452449
--extra-vars 'ansible_ssh_pass=$(cat $temp_file)' --extra-vars @$VARS_FILE -e @$system_params \
453-
-e '_workspace_directory=$system_config_folder' -e $extra_vars"
450+
-e '_workspace_directory=$system_config_folder' $extra_vars"
454451
else
455452
local password_file="${cmd_dir}/../WORKSPACES/SYSTEM/$SYSTEM_CONFIG_NAME/password"
456453
check_file_exists "$password_file" \
457454
"password file not found in WORKSPACES/SYSTEM/$SYSTEM_CONFIG_NAME directory."
458455
command="ansible-playbook ${cmd_dir}/../src/$playbook_name.yml -i $system_hosts \
459456
--extra-vars 'ansible_ssh_pass=$(cat $password_file)' --extra-vars @$VARS_FILE -e @$system_params \
460-
-e '_workspace_directory=$system_config_folder' -e $extra_vars"
457+
-e '_workspace_directory=$system_config_folder' $extra_vars"
461458
fi
462459

463460
else

0 commit comments

Comments
 (0)