ansible · IPvSean · Jul 12, 2024 · Jul 11, 2024 · Jul 11, 2024
diff --git a/exercises/rhdp_auto_satellite/3-convert2rhel/1.1-setup/README.md b/exercises/rhdp_auto_satellite/3-convert2rhel/1.1-setup/README.md
@@ -7,9 +7,9 @@
   - [Objectives](#objectives)
   - [Guide](#guide)
     - [Your Lab Environment](#your-lab-environment)
-    - [Step 1 - Access the Environment](#step-1---access-the-environment)
-    - [Step 2 - Open a Terminal Session](#step-2---open-a-terminal-session)
-    - [Step 3 - Access the AAP Web UI](#step-3---access-the-aap-web-ui)
+    - [Step 1 - Access the AAP Web UI](#step-1---access-the-aap-web-ui)
+    - [Step 2 - Access the Visual Studio Code Web UI](#step-2---access-the-visual-studio-code-web-ui)
+    - [Step 3 - Open a Terminal Session](#step-3---open-a-terminal-session)
     - [Step 4 - Access the Satellite Web UI](#step-4---access-the-satellite-web-ui)
     - [Step 5 - Access the RHEL Web Console](#step-5---access-the-centos-web-console)
     - [Step 6 - Challenge Labs](#step-6---challenge-labs)
@@ -38,7 +38,21 @@ The workshop is provisioned with a pre-configured lab environment. You will have
 | Managed Host 5 - CentOS/OracleLinux | node5          |
 | Managed Host 6 - CentOS/OracleLinux | node6          |
 
-### Step 1 - Access the Environment
+### Step 1 - Access the AAP Web UI
+
+The AAP Web UI is where we will go to submit and check the status of the Ansible playbook jobs we will use to automate the CentOS conversion workflow.
+
+- Let's open the AAP Web UI in a new web browser tab using the "Console" link under "Red Hat Ansible Automation Controller" on the workshop launch page. For example:
+
+  ![Example link to AAP Web UI](images/aap_link.png)
+
+- Enter the username `admin` and the password provided. This will bring you to your AAP Web UI dashboard like the example below:
+
+  ![Example AAP Web UI dashboard](images/aap_console_example.svg)
+
+- We will learn more about how to use the AAP Web UI in the next exercise.
+
+### Step 2 - Access the Visual Studio Code Web UI
 
 We will use Visual Studio Code (VS Code) as it provides a convenient and intuitive way to use a web browser to edit files and access terminal sessions. If you are a command line hero, direct SSH access is available if VS Code is not to your liking. There is a short YouTube video to explain if you need additional clarity: <a href="https://youtu.be/Y_Gx4ZBfcuk">Ansible Workshops - Accessing your workbench environment</a>.
 
@@ -52,7 +66,7 @@ We will use Visual Studio Code (VS Code) as it provides a convenient and intuiti
 >
 > A welcome wizard may appear to guide you through configuring your VS Code user experience. This is optional as the default settings will work fine for this workshop. Feel free to step though the wizard to explore the VS code bells and whistles or you may just skip it.
 
-### Step 2 - Open a Terminal Session
+### Step 3 - Open a Terminal Session
 
 Terminal sessions provide access to the OS commands and utilities that will help us understand what's going on "behind the curtain" when the CentOS conversion automation is doing its thing.
 
@@ -68,20 +82,6 @@ Terminal sessions provide access to the OS commands and utilities that will help
 
 - In the example above, the command `ssh node4` connects us to a new session on the node4 host. Then the commands `cat /etc/redhat-release` and `uname -r` are used to output the OS release information `CentOS Linux release 7.9.2009 (Core)` and kernel version `3.10.0-1160.102.1.el7.x86_64` from that host.
 
-### Step 3 - Access the AAP Web UI
-
-The AAP Web UI is where we will go to submit and check the status of the Ansible playbook jobs we will use to automate the CentOS conversion workflow.
-
-- Let's open the AAP Web UI in a new web browser tab using the "Console" link under "Red Hat Ansible Automation Controller" on the workshop launch page. For example:
-
-  ![Example link to AAP Web UI](images/aap_link.png)
-
-- Enter the username `admin` and the password provided. This will bring you to your AAP Web UI dashboard like the example below:
-
-  ![Example AAP Web UI dashboard](images/aap_console_example.svg)
-
-- We will learn more about how to use the AAP Web UI in the next exercise.
-
 ### Step 4 - Access the Satellite Web UI
 
 The Satellite Web UI is where we will go to review the Lifecycle Environments, Content Views and Activation Keys configured on the Satellite, as well as tracking the status of the CentOS hosts as we proceed through the conversion workflow through to when they become RHEL hosts.

diff --git a/exercises/rhdp_auto_satellite/3-convert2rhel/1.2-three-tier-app/README.md b/exercises/rhdp_auto_satellite/3-convert2rhel/1.2-three-tier-app/README.md
@@ -144,9 +144,36 @@ This use-case will focus on conversion from CentOS (though this could be another
 
 ### Step 3 - Install Three Tier Application
 
-- In the AAP Web UI, navigate to Resources > Templates by clicking on "Templates" under the "Resources" group in the navigation menu. This will bring up a list of job templates that can be used to run playbook jobs on target hosts:
+- In the AAP Web UI, navigate to Resources > Templates by clicking on "Templates" under the "Resources" group in the navigation menu. This will bring up a list of job templates that can be used to run playbook jobs on target hosts.
 
-  ![Job templates listed on AAP Web UI](images/aap_templates.png)
+  ![Job templates on AAP Web UI with EC2 filter](images/aap_templates_ec2_filter.png)
+
+- In the filter box, enter `EC2` and then click the magnifying glass. This will bring up a list of job templates specific to AWS/EC2 automation: 
+
+  ![EC2 Job templates Instance Action](images/aap_templates_ec2_instance_action.png)
+
+- Click ![launch](images/convert2rhel-aap2-launch.png) to the right of **EC2 / Instance action**:
+
+  ![EC2 Instance Action Other](images/ec2_instance_action_other.png)
+
+- For the `Launch | EC2 / Instance action - Other prompts` dialog, click **Next**.
+
+  ![EC2 Instance Action Survey](images/ec2_instance_action_survey.png)
+
+- On the `Launch | EC2 / Instance action - Survey` dialog:
+  - For `Select EC2 instance action` select "start".
+  - For `Select OS target` select "CentOS7".
+  - For `Select Environment stage` select "Dev".
+
+  Then, click **Next**.
+
+  ![EC2 Instance Action Launch](images/ec2_instance_action_launch.png)
+
+- On the `Launch | EC2 / Instance action - Preview` dialog, review and then click **Launch**. Once the `EC2 / Instance action` job has completed, our CentOS7 instances will be started and available for installing the three tier application stack.
+
+- In the AAP Web UI, navigate to Resources > Templates by clicking on "Templates" under the "Resources" group in the navigation menu. This will bring up a list of job templates.
+
+  ![Job templates on AAP Web UI with EC2 filter](images/aap_templates.png)
 
 - Click ![launch](images/convert2rhel-aap2-launch.png) to the right of **CONVERT2RHEL / 98 - Three Tier App deployment** to launch the job.
 

diff --git a/...satellite/3-convert2rhel/1.2-three-tier-app/images/aap_templates_ec2_filter.png b/...satellite/3-convert2rhel/1.2-three-tier-app/images/aap_templates_ec2_filter.png
diff --git a/.../3-convert2rhel/1.2-three-tier-app/images/aap_templates_ec2_instance_action.png b/.../3-convert2rhel/1.2-three-tier-app/images/aap_templates_ec2_instance_action.png
diff --git a/...tellite/3-convert2rhel/1.2-three-tier-app/images/ec2_instance_action_launch.png b/...tellite/3-convert2rhel/1.2-three-tier-app/images/ec2_instance_action_launch.png
diff --git a/...atellite/3-convert2rhel/1.2-three-tier-app/images/ec2_instance_action_other.png b/...atellite/3-convert2rhel/1.2-three-tier-app/images/ec2_instance_action_other.png
diff --git a/...tellite/3-convert2rhel/1.2-three-tier-app/images/ec2_instance_action_survey.png b/...tellite/3-convert2rhel/1.2-three-tier-app/images/ec2_instance_action_survey.png
diff --git a/exercises/rhdp_auto_satellite/4-ripu/1.1-setup/README.md b/exercises/rhdp_auto_satellite/4-ripu/1.1-setup/README.md
@@ -7,9 +7,9 @@
   - [Objectives](#objectives)
   - [Guide](#guide)
     - [Your Lab Environment](#your-lab-environment)
-    - [Step 1 - Access the Environment](#step-1---access-the-environment)
-    - [Step 2 - Open a Terminal Session](#step-2---open-a-terminal-session)
-    - [Step 3 - Access the AAP Web UI](#step-3---access-the-aap-web-ui)
+    - [Step 1 - Access the AAP Web UI](#step-1---access-the-aap-web-ui)
+    - [Step 2 - Access the Visual Studio Code Web UI](#step-2---access-the-visual-studio-code-web-ui)
+    - [Step 3 - Open a Terminal Session](#step-3---open-a-terminal-session)
     - [Step 4 - Access the Satellite Web UI](#step-4---access-the-satellite-web-ui)
     - [Step 5 - Access the RHEL Web Console](#step-5---access-the-rhel-web-console)
     - [Step 6 - RHEL In-place Upgrade Automation exercise job template deploy](#step-6---rhel-in---place-upgrade-automation-exercise-job-template-deploy)
@@ -39,7 +39,21 @@ The workshop is provisioned with a pre-configured lab environment. You will have
 | Managed Host 5 - CentOS/OracleLinux | node5          |
 | Managed Host 6 - CentOS/OracleLinux | node6          |
 
-### Step 1 - Access the Environment
+### Step 1 - Access the AAP Web UI
+
+The AAP Web UI is where we will go to submit and check the status of the Ansible playbook jobs we will use to automate the RHEL in-place upgrade workflow.
+
+- Let's open the AAP Web UI in a new web browser tab using the "Console" link under "Red Hat Ansible Automation Controller" on the workshop launch page. For example:
+
+  ![Example link to AAP Web UI](images/aap_link.png)
+
+- Enter the username `admin` and the password provided. This will bring you to your AAP Web UI dashboard like the example below:
+
+  ![Example AAP Web UI dashboard](images/aap_console_example.svg)
+
+- We will learn more about how to use the AAP Web UI in the next exercise.
+
+### Step 2 - Access the Visual Studio Code Web UI
 
 We will use Visual Studio Code (VS Code) as it provides a convenient and intuitive way to use a web browser to edit files and access terminal sessions. If you are a command line hero, direct SSH access is available if VS Code is not to your liking. There is a short YouTube video to explain if you need additional clarity: <a href="https://youtu.be/Y_Gx4ZBfcuk">Ansible Workshops - Accessing your workbench environment</a>.
 
@@ -53,7 +67,7 @@ We will use Visual Studio Code (VS Code) as it provides a convenient and intuiti
 >
 > A welcome wizard may appear to guide you through configuring your VS Code user experience. This is optional as the default settings will work fine for this workshop. Feel free to step though the wizard to explore the VS code bells and whistles or you may just skip it.
 
-### Step 2 - Open a Terminal Session
+### Step 3 - Open a Terminal Session
 
 Terminal sessions provide access to the RHEL commands and utilities that will help us understand what's going on "behind the curtain" when the RHEL in-place upgrade automation is doing its thing.
 
@@ -69,20 +83,6 @@ Terminal sessions provide access to the RHEL commands and utilities that will he
 
 - In the example above, the command `ssh node1` connects us to a new session on the node1 host. Then the commands `cat /etc/redhat-release` and `uname -r` are used to output the OS release information `Red Hat Enterprise Linux Server release 7.9 (Maipo)` and kernel version `3.10.0-1160.102.1.el7.x86_64` from that host.
 
-### Step 3 - Access the AAP Web UI
-
-The AAP Web UI is where we will go to submit and check the status of the Ansible playbook jobs we will use to automate the RHEL in-place upgrade workflow.
-
-- Let's open the AAP Web UI in a new web browser tab using the "Console" link under "Red Hat Ansible Automation Controller" on the workshop launch page. For example:
-
-  ![Example link to AAP Web UI](images/aap_link.png)
-
-- Enter the username `admin` and the password provided. This will bring you to your AAP Web UI dashboard like the example below:
-
-  ![Example AAP Web UI dashboard](images/aap_console_example.svg)
-
-- We will learn more about how to use the AAP Web UI in the next exercise.
-
 ### Step 4 - Access the Satellite Web UI
 
 The Satellite Web UI is where we will go to review the Lifecycle Environments, Content Views and Activation Keys configured on the Satellite, as well as tracking the status of the RHEL hosts as we proceed through the upgrade workflow through as they move to the next RHEL major version.