From e3b84a8b876265c52596ca8bd28d85cca6fb8bac Mon Sep 17 00:00:00 2001
From: ipvsean <sean@cavanaugh.pro>
Date: Thu, 5 Mar 2020 14:40:02 -0500
Subject: [PATCH] trying to fix openscap

---
 playbooks/10_openscap.yml                 |  7 ++++++-
 playbooks/test.md                         | 15 ++++-----------
 roles/generate_readme/templates/readme.j2 |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/playbooks/10_openscap.yml b/playbooks/10_openscap.yml
index 0148f9b..2bda80b 100644
--- a/playbooks/10_openscap.yml
+++ b/playbooks/10_openscap.yml
@@ -19,8 +19,13 @@
       stat:
         path: "{{ssg_schema}}"
 
+    # - name: create HTML report
+    #   command: "oscap xccdf eval --fetch-remote-resources --profile xccdf_org.ssgproject.content_profile_standard --results report.xml --report index.html {{ssg_schema}}"
+    #   register: command_result
+    #   failed_when: "'Error' in command_result.stderr"
+
     - name: create HTML report
-      command: "oscap xccdf eval --fetch-remote-resources --profile xccdf_org.ssgproject.content_profile_standard --results report.xml --report index.html {{ssg_schema}}"
+      command: "oscap xccdf eval --profile xccdf_org.ssgproject.content_profile_standard --results report.xml --report index.html {{ssg_schema}}"
       register: command_result
       failed_when: "'Error' in command_result.stderr"
 
diff --git a/playbooks/test.md b/playbooks/test.md
index f5aab3b..904cd5a 100644
--- a/playbooks/test.md
+++ b/playbooks/test.md
@@ -30,35 +30,28 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
     <td><pre>demo: windows_iis</pre></td>
     <td>install webserver on Windows Server with a survey</td>
     <td>Not available </td>
-    <td>- windows
-</td>
+    <td><ul><li>windows</li></ul></td>
   </tr>
   <tr>
     <td>Create Developer Report</td>
     <td><pre>demo: developer_report</pre></td>
     <td>Create HTML report using <a href="https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts">Ansible facts</a></td>
     <td>Not available </td>
-    <td>- f5
-- rhel
-</td>
+    <td><ul><li>f5</li></ul><li>rhel</li></ul></td>
   </tr>
   <tr>
     <td>Deploy Application (survey)</td>
     <td><pre>demo: deploy_application</pre></td>
     <td>install yum applications on Linux with a survey</td>
     <td><a href="https://www.youtube.com/watch?v=pU8ZgSBuEJw&list=PLdu06OJoEf2bp-PNtxPP_2n7Avkax8TED">Video Link</a></td>
-    <td>- f5
-- rhel
-</td>
+    <td><ul><li>f5</li></ul><li>rhel</li></ul></td>
   </tr>
   <tr>
     <td>Create Openscap Report</td>
     <td><pre>demo: openscap</pre></td>
     <td>Create HTML report using SCAP Security Guide (SSG)</td>
     <td>Not available </td>
-    <td>- f5
-- rhel
-</td>
+    <td><ul><li>f5</li></ul><li>rhel</li></ul></td>
   </tr>
 </table>
 
diff --git a/roles/generate_readme/templates/readme.j2 b/roles/generate_readme/templates/readme.j2
index c38afe2..3190de2 100644
--- a/roles/generate_readme/templates/readme.j2
+++ b/roles/generate_readme/templates/readme.j2
@@ -31,7 +31,7 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
     <td><pre>demo: {{key}}</pre></td>
     <td>{{value.description}}</td>
     <td>{% if value.video is defined%}<a href="{{ value.video}}">Video Link</a>{% else %}Not available {% endif %}</td>
-    <td>{{value.workshop_type|to_nice_yaml}}</td>
+    <td><ul>{% for workshop in value.workshop_type %}<li>{{workshop}}</li></ul>{% endfor %}</td>
   </tr>
 {% endfor %}
 </table>