Merge "Use infra generation of ARA reports"

roles/collect-logs/defaults/main.yml

@@ -211,3 +211,4 @@ influxdb_create_data_file: true
 odl_extra_log_dir: /var/log/extra/odl
 odl_extra_info_log: "{{ odl_extra_log_dir }}/odl_info.log"
 ara_overcloud_db_path: "/var/lib/mistral/overcloud/ara_overcloud.sqlite"
+ara_generate_html: true

roles/collect-logs/tasks/publish.yml

@@ -15,6 +15,9 @@
     | gzip > {{ artcl_collect_dir }}/console.txt.gz
   when: lookup('env', 'BUILD_URL') != ""
 
+- when: ara_generate_html|bool
+  block:
+
     - name: Generate and retrieve the ARA static playbook report
       shell: >
         {{ local_working_dir }}/bin/ara generate html {{ local_working_dir }}/ara_oooq;
@@ -43,6 +46,18 @@
       environment:
         ARA_DATABASE: 'sqlite:///{{ ara_overcloud_db_path }}'
 
+- name: Copy ara files to ara-report directories
+  shell: |
+    mkdir -p {{ artcl_collect_dir }}/{{ item.dir }}/ara-report;
+    cp {{ item.file }} {{ artcl_collect_dir }}/{{ item.dir }}/ara-report/ansible.sqlite;
+  loop:
+    - dir: ara_oooq
+      file: "{{ local_working_dir }}/ara.sqlite"
+    - dir: ara_oooq_overcloud
+      file: "{{ ara_overcloud_db_path }}"
+  ignore_errors: true
+  when: not ara_generate_html|bool
+
 - include: ara_graphite.yml
   when: ara_graphite_server is defined
   ignore_errors: true