Add landing page (#25)

* work on landing page

* work on landing page

* work on landing page

* landing page

* landing page

* landing page

* landing page

* landing page

* landing page

* landing page

* landing page

* landing page

* landing page

* landing page

* add files

* derp

* add link

* add link

* add link

* add link

* add link

* add link

* add link

* add link

* add link

* add link

* add link

* add link

* add link

* add ee

* add ee

* add ee

* fix landing page

* fix landing page

* fix landing page

* fix landing page

* fix landing page

* remove commented out sections

collections/ansible_collections/demo/patching/roles/report_server/files/css/new.css

@@ -0,0 +1,202 @@
+p.hostname {
+    color: #000000;
+    font-weight: bolder;
+    font-size: large;
+    margin: auto;
+    width: 50%;
+  }
+  
+  #subtable {
+    background: #ebebeb;
+    margin: 0px;
+    width: 100%;
+  }
+  
+  #subtable tbody tr td {
+    padding: 5px 5px 5px 5px;
+  }
+  
+  #subtable thead th {
+    padding: 5px;
+  }
+  
+  * {
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    font-family: "Open Sans", "Helvetica";
+  
+  }
+  
+  a {
+    color: #000000;
+  }
+  
+  p {
+    color: #ffffff;
+  }
+  h1 {
+    text-align: center;
+    color: #ffffff;
+  }
+  
+  body {
+    background:#353a40;
+    padding: 0px;
+    margin: 0px;
+    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  }
+  
+  table {
+    border-collapse: separate;
+    background:#fff;
+    @include border-radius(5px);
+    @include box-shadow(0px 0px 5px rgba(0,0,0,0.3));
+  }
+
+  .main_net_table {
+    margin:50px auto;
+  }
+  
+  thead {
+    @include border-radius(5px);
+  }
+  
+  thead th {
+    font-size:16px;
+    font-weight:400;
+    color:#fff;
+    @include text-shadow(1px 1px 0px rgba(0,0,0,0.5));
+    text-align:left;
+    padding:20px;
+    border-top:1px solid #858d99;
+    background: #353a40;
+  
+    &:first-child {
+     @include border-top-left-radius(5px);
+    }
+  
+    &:last-child {
+      @include border-top-right-radius(5px);
+    }
+  }
+  
+  tbody tr td {
+    font-weight:400;
+    color:#5f6062;
+    font-size:13px;
+    padding:20px 20px 20px 20px;
+    border-bottom:1px solid #e0e0e0;
+  }
+  
+  tbody tr:nth-child(2n) {
+    background:#f0f3f5;
+  }
+  
+  tbody tr:last-child td {
+    border-bottom:none;
+    &:first-child {
+      @include border-bottom-left-radius(5px);
+    }
+    &:last-child {
+      @include border-bottom-right-radius(5px);
+    }
+  }
+  
+  td {
+    vertical-align: top;
+  }
+
+  span.highlight {
+      background-color: yellow;
+  }
+  
+  .expandclass {
+    color: #5f6062;
+  }
+  
+  .content{
+           display:none;
+           margin: 10px;
+  }
+  
+  header {
+    width: 100%;
+    position: initial;
+    float: initial;
+    padding: 0;
+    margin: 0;
+    border-radius: 0;
+    height: 88px;
+    background-color: #171717;
+  }
+  
+  .header-container {
+    margin: 0 auto;
+    width: 100%;
+    height: 100%;
+    max-width: 1170px;
+    padding: 0;
+    float: initial;
+    display: flex;
+    align-items: center;
+  }
+  
+  .header-logo {
+    width: 137px;
+    border: 0;
+    margin: 0;
+    margin-left: 15px;
+  }
+  
+  .header-link {
+    margin-left: 40px;
+    text-decoration: none;
+    cursor: pointer;
+    text-transform: uppercase;
+    font-size: 15px;
+    font-family: 'Red Hat Text';
+    font-weight: 500;
+  }
+  
+  .header-link:hover {
+    text-shadow: 0 0 0.02px white;
+    text-decoration: none;
+  }
+  
+  table.net_info td {
+    padding: 5px;
+}
+
+p.expandclass:hover {
+    text-decoration: underline;
+    color: #EE0000;
+    cursor: pointer;
+}
+
+.summary_info {
+}
+
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active, a.ui-button:active, .ui-button:active, .ui-button.ui-state-active:hover {
+    border: 1px solid #5F0000;
+    background: #EE0000;
+}
+
+div#net_content {
+    padding: 0px;
+    height: auto !important;
+}
+
+img.router_image {
+    vertical-align: middle;
+    padding: 0px 10px 10px 10px;
+    width: 50px;
+}
+
+table.net_info {
+    width: 100%;
+}
+
+p.internal_label {
+    color: #000000;
+}

collections/ansible_collections/demo/patching/roles/report_server/files/redhat-ansible-logo.svg

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Logos" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="930.2px" height="350px" viewBox="0 0 930.2 350" style="enable-background:new 0 0 930.2 350;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#EE0000;}
+</style>
+<title>Logo-Red_Hat-Ansible_Automation_Platform-A-Reverse-RGB</title>
+<path class="st0" d="M383.3,228.5h18.8L446,335.7h-17.5l-12.4-31.4h-48l-12.6,31.4h-16.7L383.3,228.5z M410.9,291l-18.7-47l-18.7,47
+	H410.9z"/>
+<path class="st0" d="M455.2,257.7h15.3v7.8c6.2-6.2,14.7-9.6,23.5-9.3c17.9,0,30.5,12.4,30.5,30.5v49h-15.3v-46.5
+	c0-12.3-7.5-19.8-19.3-19.8c-7.8-0.3-15.1,3.6-19.3,10.1v56.1h-15.3V257.7z"/>
+<path class="st0" d="M543,315.5c8.1,6.4,16.7,9.8,25.4,9.8c11,0,18.7-4.8,18.7-11.7c0-5.5-4-8.7-12.6-10l-14.1-2
+	c-15.5-2.3-23.3-9.5-23.3-21.6c0-14.1,12.3-23.6,30.5-23.6c11.3-0.1,22.3,3.4,31.5,9.9l-7.8,10.1c-8.6-5.7-16.4-8.1-24.7-8.1
+	c-9.3,0-15.6,4.3-15.6,10.6c0,5.7,3.7,8.4,12.9,9.8l14.1,2c15.5,2.3,23.6,9.7,23.6,21.7c0,14-14.1,24.5-32.6,24.5
+	c-13.5,0-25.6-4-34.2-11.5L543,315.5z"/>
+<path class="st0" d="M611.6,235.6c0-5.2,4.1-9.4,9.3-9.5c0,0,0,0,0,0c5.2-0.2,9.7,3.9,9.9,9.1c0.2,5.2-3.9,9.7-9.1,9.9
+	c-0.2,0-0.5,0-0.7,0C615.8,245.1,611.6,240.9,611.6,235.6C611.6,235.7,611.6,235.7,611.6,235.6z M628.6,335.7h-15.3v-78h15.3V335.7z
+	"/>
+<path class="st0" d="M685.5,336.9c-8.5,0-16.8-2.7-23.6-7.8v6.6h-15.2V228.5l15.3-3.4v40c6.6-5.6,15.1-8.7,23.7-8.6
+	c22.1,0,39.4,17.7,39.4,40.1C725.2,319.1,707.9,336.9,685.5,336.9z M662,279.2v35.2c4.9,5.7,13,9.2,21.8,9.2
+	c15,0,26.4-11.5,26.4-26.8c0-15.3-11.5-27-26.4-27C674.9,269.8,667.1,273.2,662,279.2z"/>
+<path class="st0" d="M755,335.7h-15.3V228.5l15.3-3.4V335.7z"/>
+<path class="st0" d="M810.5,337.1c-23,0-40.9-17.7-40.9-40.4c0-22.5,17.2-40.1,39.1-40.1c21.5,0,37.7,17.8,37.7,40.8v4.4h-61.6
+	c2,13,13.2,22.5,26.4,22.4c7.2,0.2,14.2-2.3,19.8-6.8l9.8,9.7C832.1,333.7,821.5,337.4,810.5,337.1z M784.9,290.2h46.3
+	c-2.3-11.9-11.5-20.8-22.8-20.8C796.5,269.4,787.2,277.8,784.9,290.2z"/>
+<path class="st1" d="M202.8,137.5c18.4,0,45.1-3.8,45.1-25.7c0.1-1.7-0.1-3.4-0.5-5l-11-47.7c-2.5-10.5-4.8-15.2-23.2-24.5
+	c-14.3-7.3-45.5-19.4-54.7-19.4c-8.6,0-11.1,11.1-21.3,11.1c-9.8,0-17.1-8.3-26.4-8.3c-8.8,0-14.6,6-19,18.4c0,0-12.4,34.9-14,40
+	c-0.3,0.9-0.4,1.9-0.4,2.9C77.6,92.9,131.1,137.5,202.8,137.5 M250.8,120.7c2.5,12.1,2.5,13.3,2.5,14.9c0,20.6-23.2,32.1-53.7,32.1
+	c-69,0-129.3-40.3-129.3-67c0-3.7,0.8-7.4,2.2-10.8c-24.8,1.3-56.9,5.7-56.9,34c0,46.4,109.9,103.5,196.9,103.5
+	c66.7,0,83.5-30.2,83.5-54C296.1,154.6,279.9,133.4,250.8,120.7"/>
+<path d="M250.7,120.7c2.5,12.1,2.5,13.3,2.5,14.9c0,20.6-23.2,32.1-53.7,32.1c-69,0-129.3-40.3-129.3-67c0-3.7,0.8-7.4,2.2-10.8
+	l5.4-13.3c-0.3,0.9-0.4,1.9-0.4,2.8c0,13.6,53.5,58.1,125.2,58.1c18.4,0,45.1-3.8,45.1-25.7c0.1-1.7-0.1-3.4-0.5-5L250.7,120.7z"/>
+<path class="st0" d="M869.1,151.2c0,17.5,10.5,26,29.7,26c5.9-0.1,11.8-1,17.5-2.5v-20.3c-3.7,1.2-7.5,1.7-11.3,1.7
+	c-7.9,0-10.8-2.5-10.8-9.9v-31.1h22.9V94.2h-22.9V67.7l-25,5.4v21.1h-16.6v20.9h16.6L869.1,151.2z M791,151.7
+	c0-5.4,5.4-8.1,13.6-8.1c5,0,10,0.7,14.9,1.9V156c-4.8,2.6-10.2,3.9-15.6,3.9C795.9,159.9,791.1,156.8,791,151.7 M798.7,177.5
+	c8.8,0,16-1.9,22.6-6.3v5h24.8v-52.5c0-20-13.5-30.9-35.9-30.9c-12.6,0-25,2.9-38.3,9l9,18.4c9.6-4,17.7-6.5,24.8-6.5
+	c10.3,0,15.6,4,15.6,12.2v4c-6.1-1.6-12.3-2.4-18.6-2.3c-21.1,0-33.8,8.8-33.8,24.6C768.9,166.6,780.4,177.6,798.7,177.5
+	 M662.5,176.2h26.7v-42.5h44.6v42.5h26.7V67.7h-26.6v41.7h-44.6V67.7h-26.7L662.5,176.2z M561,135.1c0-11.8,9.3-20.8,21.5-20.8
+	c6.4-0.1,12.6,2.1,17.4,6.4v28.6c-4.7,4.4-10.9,6.7-17.4,6.5C570.5,155.8,561,146.8,561,135.1 M600.2,176.1H625V62.3l-25,5.4v30.8
+	c-6.4-3.6-13.6-5.5-20.9-5.4c-23.9,0-42.6,18.4-42.6,42c-0.3,23,18.1,41.9,41.1,42.2c0.2,0,0.5,0,0.7,0c7.9,0,15.6-2.5,22-7.1V176.1
+	z M486.5,113.2c7.9,0,14.6,5.1,17.2,13h-34.2C471.9,118,478.2,113.2,486.5,113.2 M444.2,135.2c0,23.9,19.5,42.5,44.6,42.5
+	c13.8,0,23.9-3.7,34.3-12.4l-16.6-14.7c-3.9,4-9.6,6.2-16.4,6.2c-8.8,0.2-16.8-4.9-20.2-13h58.4v-6.2c0-26-17.5-44.8-41.4-44.8
+	c-23.2-0.4-42.4,18.2-42.7,41.5C444.2,134.6,444.2,134.9,444.2,135.2 M400.9,90.5c8.8,0,13.8,5.6,13.8,12.2s-5,12.2-13.8,12.2h-26.3
+	V90.5H400.9z M347.9,176.2h26.7v-39.5h20.3l20.5,39.5h29.7l-23.9-43.4c12.4-5,20.5-17.1,20.4-30.5c0-19.5-15.3-34.5-38.3-34.5H348
+	L347.9,176.2z"/>
+</svg>

collections/ansible_collections/demo/patching/roles/report_server/tasks/apache.yml

@@ -1,20 +1,22 @@
 ---
+- include_vars: "{{ ansible_system }}.yml"
+
 - yum:
     name: httpd
     state: latest
   check_mode: no
 
 - file:
-    path: /var/www/html/reports/
+    path: "{{ doc_root }}/{{ reports_dir }}"
     state: directory
   check_mode: no
 
 - copy:
-    dest: /var/www/html/reports/.htaccess
+    dest: "{{ doc_root }}/{{ reports_dir }}/.htaccess"
     content: Options +Indexes
   check_mode: no
 
 - service:
     name: httpd
     state: started
-  check_mode: no
+  check_mode: no

collections/ansible_collections/demo/patching/roles/report_server/tasks/iis.yml

@@ -1,4 +1,6 @@
 ---
+- include_vars: "{{ ansible_system }}.yml"
+
 - name: Install IIS
   ansible.windows.win_feature:
     name: Web-Server
@@ -13,11 +15,11 @@
 
 - name: Create Directory
   ansible.windows.win_file:
-    path: C:\Inetpub\wwwroot\reports
+    path: "{{ doc_root }}\\{{ reports_dir }}"
     state: directory
   check_mode: no
 
 - name: Enable Directory Browsing
   ansible.windows.win_powershell:
     script: |
-      "Set-WebConfigurationProperty -filter /system.webServer/directoryBrowse -name enabled -value true -PSPath 'IIS:\Sites\Default Web Site\reports'"
+      "Set-WebConfigurationProperty -filter /system.webServer/directoryBrowse -name enabled -value true -PSPath 'IIS:\Sites\Default Web Site\reports'"

collections/ansible_collections/demo/patching/roles/report_server/tasks/linux_landing_page.yml

@@ -0,0 +1,34 @@
+---
+- include_vars: "{{ ansible_system }}.yml"
+
+- name: get reports
+  ansible.builtin.find:
+    paths: "{{ doc_root }}/{{ reports_dir }}"
+    patterns: '*.html'
+  register: reports
+  check_mode: no
+
+- name: publish landing page
+  ansible.builtin.template:
+    src: linux_report.j2
+    dest: "{{ doc_root }}/index.html"
+  check_mode: no
+
+- name: copy CSS over
+  ansible.builtin.copy:
+    src: "css"
+    dest: "{{ doc_root }}"
+    directory_mode: true
+  check_mode: no
+
+- name: copy logos over
+  ansible.builtin.copy:
+    src: "{{ item }}" 
+    dest: "{{ doc_root }}"
+    directory_mode: true
+  loop:
+    - "webpage_logo.png"
+    - "redhat-ansible-logo.svg"
+    - "report.png"
+  check_mode: no
+    

collections/ansible_collections/demo/patching/roles/report_server/tasks/main.yml

@@ -0,0 +1,6 @@
+---
+- include_tasks: apache.yml
+  when: ansible_system == 'Linux'
+
+- include_tasks: iis.yml
+  when: ansible_system == 'Win32NT'

collections/ansible_collections/demo/patching/roles/report_server/tasks/windows_landing_page.yml

@@ -0,0 +1,34 @@
+---
+- include_vars: "{{ ansible_system }}.yml"
+
+- name: get reports
+  ansible.windows.win_find:
+    paths: "{{ doc_root }}/{{ reports_dir }}"
+    patterns: '*.html'
+  register: reports
+  check_mode: no
+
+- name: publish landing page
+  ansible.builtin.win_template:
+    src: windows_report.j2
+    dest: "{{ doc_root }}/index.html"
+  check_mode: no
+
+- name: copy CSS over
+  ansible.builtin.win_copy:
+    src: "css"
+    dest: "{{ doc_root }}"
+    directory_mode: true
+  check_mode: no
+
+- name: copy logos over
+  ansible.builtin.win_copy:
+    src: "{{ item }}" 
+    dest: "{{ doc_root }}"
+    directory_mode: true
+  loop:
+    - "webpage_logo.png"
+    - "redhat-ansible-logo.svg"
+    - "report.png"
+  check_mode: no
+    

collections/ansible_collections/demo/patching/roles/report_server/templates/header.j2

@@ -0,0 +1,15 @@
+
+   
+  <div class="wrapper">
+    <header>
+      <div class="header-container">
+        <a href="https://ansible.com">
+          <img
+            class="header-logo"
+            src="redhat-ansible-logo.svg"
+            title="Red Hat Ansible"
+            alt="Red Hat Ansible"
+          />
+        </a>
+      </div>
+    </header>

collections/ansible_collections/demo/patching/roles/report_server/templates/linux_report.j2

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title> Ansible Linux Automation Report </title>
+  <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans" />
+  <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+  <link rel="stylesheet" href="css/new.css">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="https://www.kryogenix.org/code/browser/sorttable/sorttable.js"></script>
+</head>
+<body>
+<div class="wrapper">
+  {% include 'header.j2' %}
+<section>
+<center>
+<h1>Ansible Automation Reports</h1>
+<h3><input type="search" placeholder="Search..." class="form-control search-input" data-table="main_net_table"/>
+</center>
+<table class="table table-striped mt32 main_net_table">
+<tbody>
+{% for report in reports.files %}
+        {% set page = report.path.split('/')[-1] %}
+        <tr>
+            <td class="summary_info">
+              <div id="hostname">
+                <p class="hostname"> <img class="router_image" src="report.png"></p>
+              </div>  
+            </td>
+            <td>
+              <a href="{{ reports_dir }}/{{ page }}"> {{ page }} <a> 
+            </td>
+{% endfor %}
+</tbody>
+</table>
+<center><p>Created with</p><br><img src="webpage_logo.png" width="300">
+</center>
+</section>
+</div>
+</body>
+</html>

collections/ansible_collections/demo/patching/roles/report_server/templates/windows_report.j2

@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title> Ansible Linux Automation Report </title>
+  <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans" />
+  <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+  <link rel="stylesheet" href="css/new.css">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+<script src="https://code.jquery.com/jquery-1.12.4.js"></script>
+<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+<script src="https://www.kryogenix.org/code/browser/sorttable/sorttable.js"></script>
+</head>
+<body>
+<div class="wrapper">
+  {% include 'header.j2' %}
+<section>
+<center>
+<h1>Ansible Automation Reports</h1>
+<h3><input type="search" placeholder="Search..." class="form-control search-input" data-table="main_net_table"/>
+</center>
+<table class="table table-striped mt32 main_net_table">
+<tbody>
+{% for report in reports.files %}
+        {% set page = report.path.split('\\')[-1] %}
+        <tr>
+            <td class="summary_info">
+              <div id="hostname">
+                <p class="hostname"> <img class="router_image" src="report.png"></p>
+              </div>  
+            </td>
+            <td>
+              <a href="{{ reports_dir }}/{{ page }}"> {{ page }} <a> 
+            </td>
+{% endfor %}
+</tbody>
+</table>
+<center><p>Created with</p><br><img src="webpage_logo.png" width="300">
+</center>
+</section>
+</div>
+</body>
+</html>

collections/ansible_collections/demo/patching/roles/report_server/vars/Linux.yml

@@ -0,0 +1,3 @@
+---
+doc_root: /var/www/html
+reports_dir: reports

collections/ansible_collections/demo/patching/roles/report_server/vars/Win32NT.yml

@@ -0,0 +1,3 @@
+---
+doc_root: C:\Inetpub\wwwroot
+reports_dir: reports

collections/ansible_collections/demo/patching/roles/report_windows/tasks/main.yml

@@ -25,4 +25,4 @@
 
 #- name: display link to inventory report
 #  ansible.builtin.debug:
-#    msg: "Please go to http://{{ host_vars[report_server]['ansible_host'] }}/reports/windows.html"
+#    msg: "Please go to http://{{ host_vars[report_server]['ansible_host'] }}/reports/windows.html"

linux/patching.yml

@@ -9,30 +9,17 @@
       name: demo.patching.patch_linux
 
   - block:
-    - yum:
-        name: httpd
-        state: latest
-      check_mode: no
-
-    - file:
-        path: /var/www/html/reports/
-        state: directory
-      check_mode: no
-
-    - copy:
-        dest: /var/www/html/reports/.htaccess
-        content: Options +Indexes
-      check_mode: no
-
-    - service:
-        name: httpd
-        state: started
-      check_mode: no
 
     - include_role:
-        name: demo.patching.report_linux
+        name: "{{ item }}"
+      loop:
+        - demo.patching.report_server
+        - demo.patching.report_linux
+        - demo.patching.report_linux_patching
 
     - include_role:
-        name: demo.patching.report_linux_patching
+        name: demo.patching.report_server
+        tasks_from: linux_landing_page
+        
     delegate_to: "{{ report_server }}"
-    run_once: yes
+    run_once: yes

linux/setup.yml

@@ -56,7 +56,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/ec2_register.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -92,7 +91,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/tshoot.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -114,7 +112,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/temp_sudo.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -144,7 +141,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/patching.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -167,7 +163,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/service_start.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -193,7 +188,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/service_stop.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -219,7 +213,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/run_script.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -243,7 +236,6 @@ controller_templates:
     project: Fact Scan
     playbook: scan_facts.yml
     inventory: Workshop Inventory
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -257,7 +249,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/podman.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -282,7 +273,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/system_roles.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry
@@ -307,7 +297,6 @@ controller_templates:
     inventory: "Workshop Inventory"
     project: "Ansible official demo project"
     playbook: "linux/compliance.yml"
-    execution_environment: Default execution environment
     notification_templates_started: Telemetry
     notification_templates_success: Telemetry
     notification_templates_error: Telemetry

windows/patching.yml

@@ -9,14 +9,17 @@
       name: demo.patching.patch_windows
 
   - block:
+
+    - include_role:
+        name: "{{ item }}"
+      loop:
+        - demo.patching.report_server
+        - demo.patching.report_windows
+        - demo.patching.report_windows_patching
+
     - include_role:
         name: demo.patching.report_server
-        tasks_from: iis
+        tasks_from: windows_landing_page
 
-    - include_role:
-        name: demo.patching.report_windows
-
-    - include_role:
-        name: demo.patching.report_windows_patching
     delegate_to: "{{ report_server }}"
-    run_once: yes
+    run_once: yes