Merge branch 'devel' into devel

Author: abwalczyk

README.md

@@ -26,12 +26,11 @@
     </span>
     <div id="lab_powered_by">Red Hat Demo Platform</div>
   </a>
-
 <!-- lab -->
-  <a target="_blank" href="./exercises/ansible_rhel_90" class="data-card">
-    <h3>RHEL 90</h3>
-    <h4>Ansible Red Hat Enterprise Linux Workshop</h4>
-    <p>Focused on automating Linux platforms like Red Hat Enterprise Linux</p>
+  <a target="_new" href="https://rhpds.github.io/showroom-virt-aap-day-2/modules/index.html" class="data-card">
+    <h3>Day 2 Ops</h3>
+    <h4>Automation with OpenShift Virtualization</h4>
+    <p>Activities we can perform with OpenShift Virtualization and AAP</p>
     <span class="link-text">
       Lab Page
       <svg width="25" height="16" viewBox="0 0 25 16" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -91,7 +90,21 @@
     </span>
   <div id="lab_powered_by">Red Hat Demo Platform</div>
   </a>
-  <a target="_blank" href="exercises/instruqt/servicenow" class="data-card">
+<!-- lab -->
+  <a target="_new" href="./exercises/ansible_rhel_90" class="data-card">
+    <h3>RHEL 90</h3>
+    <h4>Ansible Red Hat Enterprise Linux Workshop</h4>
+    <p>Focused on automating Linux platforms like Red Hat Enterprise Linux</p>
+    <span class="link-text">
+      Lab Page
+      <svg width="25" height="16" viewBox="0 0 25 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.8631 0.929124L24.2271 7.29308C24.6176 7.68361 24.6176 8.31677 24.2271 8.7073L17.8631 15.0713C17.4726 15.4618 16.8394 15.4618 16.4489 15.0713C16.0584 14.6807 16.0584 14.0476 16.4489 13.657L21.1058 9.00019H0.47998V7.00019H21.1058L16.4489 2.34334C16.0584 1.95281 16.0584 1.31965 16.4489 0.929124C16.8394 0.538599 17.4726 0.538599 17.8631 0.929124Z" fill="#000000"/>
+</svg>
+    </span>
+    <div id="lab_powered_by">Red Hat Demo Platform</div>
+  </a>
+  <!-- lab -->
+  <a target="_new" href="exercises/instruqt/servicenow" class="data-card">
     <h3>ServiceNow</h3>
     <h4>Getting Started with ServiceNow Automation</h4>
     <p>Focused on using Ansible Automation in conjunction with an IT Service Management (ITSM) tool</p>

exercises/ansible_rhel/1.4-variables/README.md

@@ -164,7 +164,7 @@ Review the output to confirm the user existence check is correctly using the var
 <br>
 
 {% if page.url contains 'ansible_rhel_90' %}
-[Previous Exercise](../3-playbook) - [Next Exercise](../5-surveys)
+[Previous Exercise](../3-playbook) - [Next Exercise](../5-projects)
 {% else %}
 [Previous Exercise](../1.3-playbook) - [Next Exercise](../1.5-handlers)
 {% endif %}

exercises/ansible_rhel/1.5-handlers/README.md

@@ -83,6 +83,7 @@ Handlers are used for tasks that should only run when notified by another task.
 
 Let's say we want to ensure the firewall is configured correctly on all web servers and then reload the firewall service to apply any new settings. We'll define a handler that reloads the firewall service and is notified by a task ^that ensures the desired firewall rules are in place. Add the following tasks to the existing playbook to install firewalld and enable firewalld and reload the service with the help of handlers.
 
+{% raw %}
 
 ```yaml
 ---
@@ -141,6 +142,8 @@ Let's say we want to ensure the firewall is configured correctly on all web serv
 
 ```
 
+{% endraw %}
+
 The handler "Reload Firewall" is triggered only if the task “Allow HTTP traffic on web servers” makes any changes.
 
 

exercises/ansible_rhel/2.3-projects/README.md

@@ -250,6 +250,12 @@ Verify that the output result is as expected.
 ---
 **Navigation**
 <br>
+
+{% if page.url contains 'ansible_rhel_90' %}
+[Previous Exercise](../4-variables) - [Next Exercise](../6-surveys)
+{% else %}
 [Previous Exercise](../2.2-cred) - [Next Exercise](../2.4-surveys)
+{% endif %}
+<br><br>
+[Click here to return to the Ansible for Red Hat Enterprise Linux Workshop](../README.md)
 
-[Click here to return to the Ansible for Red Hat Enterprise Linux Workshop](../README.md#section-2---ansible-tower-exercises)

exercises/ansible_rhel/2.4-surveys/README.md

@@ -136,7 +136,10 @@ Verify that the output result is as expected.
 <br>
 
 {% if page.url contains 'ansible_rhel_90' %}
-[Previous Exercise](../4-variables) - [Next Exercise](../../ansible_rhel_90/6-system-roles/)
-{% else %}
+[Previous Exercise](../5-projects) - [Next Exercise](../7-system-roles)
+{% else %}                       
 [Previous Exercise](../2.3-projects) - [Next Exercise](../2.5-rbac)
-{% endif %}
+{% endif %}                      
+<br><br>                         
+[Click here to return to the Ansible for Red Hat Enterprise Linux Workshop](../README.md)
+

exercises/ansible_rhel_90/5-projects

@@ -0,0 +1 @@
+../ansible_rhel/2.3-projects/

exercises/ansible_rhel_90/5-surveys exercises/ansible_rhel_90/6-surveysexercises/ansible_rhel_90/5-surveys renamed to exercises/ansible_rhel_90/6-surveys

@@ -194,6 +194,12 @@ You have completed lab exercise
 ----
 **Navigation**
 <br>
-[Previous Exercise](../5-surveys)
-<br><br>
+
+{% if page.url contains 'ansible_rhel_90' %}                             
+[Previous Exercise](../6-surveys)
+{% else %}                                                               
+[Previous Exercise](../2.4-surveys)
+{% endif %}                                                              
+<br><br>                                                                 
 [Click here to return to the Ansible for Red Hat Enterprise Linux Workshop](../README.md)
+