[setup/ansible] Merge logs

ansible/ansible.cfg

@@ -3,6 +3,7 @@ host_key_checking = False
 localhost_warning = False
 callbacks_enabled = ansible.posix.profile_tasks
 force_handlers = True
+log_path = /var/log/ovos-ansible.log
 
 [ssh_connection]
 pipelining = True

setup.sh

@@ -109,6 +109,9 @@ ansible-playbook -i 127.0.0.1, ansible/site.yml \
   -e "ovos_installer_reboot_file_path=${REBOOT_FILE_PATH}" \
   "${ansible_tags[@]}" "${ansible_debug[@]}"
 
+# Concatenate Ansible log with installer log
+cat $ANSIBLE_LOG_FILE >>$LOG_FILE
+
 # Retrieve the ansible-playbook status code before tee command and check for success or failure
 if [ "${PIPESTATUS[0]}" -eq 0 ]; then
   if [ "$CONFIRM_UNINSTALL" == "false" ] || [ -z "$CONFIRM_UNINSTALL" ]; then

utils/constants.sh

@@ -1,5 +1,6 @@
 #!/bin/env bash
 
+export ANSIBLE_LOG_FILE=/var/log/ovos-ansible.log
 export ATMEGA328P_SIGNATURE=":030000001E950F3B"
 export AVRDUDE_BINARY_PATH=/usr/local/bin/avrdude
 export AVRDUDE_BINARY_URL="https://artifacts.smartgic.io/avrdude/avrdude-aarch64"