Skip to content

Commit 29a1dc3

Browse files
committed
Revert "Enhance setup and automation scripts by installing required Ansible collections and updating virtual environment paths"
This reverts commit 2566ee0.
1 parent 2566ee0 commit 29a1dc3

3 files changed

Lines changed: 4 additions & 12 deletions

File tree

scripts/sap_automation_qa.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,6 @@ run_ansible_playbook() {
222222
log "INFO" "Extracted key_vault_id: $key_vault_id"
223223
fi
224224

225-
log "INFO" "Installing required Ansible collections..."
226-
ansible-galaxy collection install community.general
227-
228225
if [[ "$auth_type" == "SSHKEY" ]]; then
229226
log "INFO" "Authentication type is SSHKEY."
230227

scripts/setup.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33

44
#!/bin/bash
55

6-
# Determine script and project directories
7-
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
8-
PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
9-
VENV_DIR="$PROJECT_ROOT/.venv"
10-
116
# Function to check if a command exists
127
command_exists() {
138
command -v "$1" &> /dev/null
@@ -57,9 +52,9 @@ packages=("python3-pip" "ansible" "sshpass" "python3-venv")
5752

5853
install_packages "${packages[@]}"
5954

60-
if [ ! -d "$VENV_DIR" ]; then
55+
if [ ! -d "../.venv" ]; then
6156
log "INFO" "Creating Python virtual environment..."
62-
if python3 -m venv "$VENV_DIR"; then
57+
if python3 -m venv ../.venv; then
6358
log "INFO" "Python virtual environment created."
6459
else
6560
log "ERROR" "Failed to create Python virtual environment."
@@ -69,7 +64,7 @@ fi
6964

7065
# Ensure virtual environment is activated
7166
log "INFO" "Activating Python virtual environment..."
72-
if source "$VENV_DIR/bin/activate"; then
67+
if source ../.venv/bin/activate; then
7368
log "INFO" "Python virtual environment activated."
7469
else
7570
log "ERROR" "Failed to activate Python virtual environment."

src/ansible.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ display_skipped_hosts = False
99
conditional_bare_variables = False
1010
interpreter_python = auto_silent
1111
callbacks_enabled = profile_tasks
12-
stdout_callback = community.general.counter_enabled
12+
stdout_callback = yaml
1313
bin_ansible_callbacks = True
1414
host_key_checking = False
1515
error_on_undefined_vars = True

0 commit comments

Comments
 (0)