Merge "Reduce number of logs and disable ara HTML report"

This commit is contained in:
Zuul 2021-03-10 19:22:45 +00:00 committed by Gerrit Code Review
commit 3c5e0f9f28
2 changed files with 4 additions and 12 deletions

View File

@ -11,6 +11,8 @@ copy_logs() {
rm ${LOG_DIR}/kolla_configs/config/ironic/ironic-agent.{kernel,initramfs} rm ${LOG_DIR}/kolla_configs/config/ironic/ironic-agent.{kernel,initramfs}
mkdir ${LOG_DIR}/system_configs/ mkdir ${LOG_DIR}/system_configs/
cp -rL /etc/{hostname,hosts,host.conf,resolv.conf,nsswitch.conf,docker,systemd} ${LOG_DIR}/system_configs/ cp -rL /etc/{hostname,hosts,host.conf,resolv.conf,nsswitch.conf,docker,systemd} ${LOG_DIR}/system_configs/
# Remove /var/log/kolla link to not double the data uploaded
unlink /var/log/kolla
cp -rvnL /var/log/* ${LOG_DIR}/system_logs/ cp -rvnL /var/log/* ${LOG_DIR}/system_logs/
@ -120,6 +122,8 @@ copy_logs() {
done done
chmod -R 777 ${LOG_DIR} chmod -R 777 ${LOG_DIR}
du -sm ${LOG_DIR}
} }
copy_logs copy_logs

View File

@ -72,16 +72,4 @@
dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}/ara-report/" dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}/ara-report/"
mode: pull mode: pull
- name: Generate HTML from ARA database
command: "ara generate html {{ ansible_env.HOME }}/ara-html"
environment:
ARA_DATABASE: "sqlite:///{{ ansible_env.HOME }}/.ara/ansible.sqlite"
- name: Download ARA HTML
synchronize:
src: "{{ ansible_env.HOME }}/ara-html"
dest: "{{ zuul.executor.log_root }}/{{ inventory_hostname }}/ara-report/"
mode: pull
rsync_opts:
- "--quiet"
when: ara_stat_result.stat.exists when: ara_stat_result.stat.exists