devops-controller update to AAP 2.4

tracks/devops-controller/01-env-overview/assignment.md

@@ -1,6 +1,6 @@
 ---
 slug: env-overview
-id: 8pspyae6np2r
+id: jagqiyn61doe
 type: challenge
 title: Environment overview
 teaser: In this challenge, we'll explore the different DevOps tools ACME Corp uses
@@ -56,11 +56,25 @@ timelimit: 300
 ===
 All the logins use the same credentials.
 
->User: student<p>
->Password: learn_ansible
+User:
+
+```yaml
+student
+```
+
+Password:
+
+```yaml
+learn_ansible
+```
 
 👋 Introduction
 ===
+### ⚙️ Resources
+
+* All the Ansible content and setup files used in this lab are available in this [repository](https://github.com/craig-br/demos/tree/main/blogs/devops-controller-blog).
+* For more information on how to use these examples, please have a look at the [DevOps and CI/CD with automation controller](https://www.ansible.com/blog/devops-and-ci/cd-with-automation-controller) blog.
+
 #### Estimated time to complete: *5 minutes*<p>
 ACME Corp use a variety of tools in their DevOps pipeline. Let's have a look at each of these tools and how they're configured.
 
@@ -229,7 +243,6 @@ If you have encountered an issue or have noticed something not quite right, plea
     display: flex;
   }
   .lightbox img {
-    /* max-height: 100% */
     max-width: 60%;
     max-height: 60%;
   }

tracks/devops-controller/01-env-overview/setup-devops-controller

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -euxo pipefail
+
+echo "Copying keys to rhel"
+cp -a /root/.ssh/id_rsa* /root/.ssh/authorized_keys /home/rhel/.ssh
+chown -R rhel:rhel /home/rhel/.ssh
+
+cd /opt/setup-scripts/devops-controller
+
+ansible-playbook setup-devops-controller.yml --tags setup-env

tracks/devops-controller/02-update-pipeline/assignment.md

@@ -1,6 +1,6 @@
 ---
 slug: update-pipeline
-id: zzggmgddjl9d
+id: ayydnxc4slob
 type: challenge
 title: Configure the ACME Corp pipeline
 teaser: We'll configure and integrate the ACME Corp pipeline using automation controller.
@@ -44,8 +44,17 @@ timelimit: 600
 ===
 All the logins use the same credentials.
 
->User: student<p>
->Password: learn_ansible
+User:
+
+```yaml
+student
+```
+
+Password:
+
+```yaml
+learn_ansible
+```
 
 👋 Introduction
 ===
@@ -224,7 +233,6 @@ If you have encountered an issue or have noticed something not quite right, plea
     display: flex;
   }
   .lightbox img {
-    /* max-height: 100% */
     max-width: 60%;
     max-height: 60%;
   }
@@ -236,11 +244,11 @@ If you have encountered an issue or have noticed something not quite right, plea
   h1 {
     font-size: 18px;
   }
-    h2 {
+  h2 {
     font-size: 16px;
     font-weight: 600
   }
-    h3 {
+  h3 {
     font-size: 14px;
     font-weight: 600
   }

tracks/devops-controller/03-update-app/assignment.md

@@ -1,6 +1,6 @@
 ---
 slug: update-app
-id: xugy2avyk20c
+id: kgmcnj8tgd15
 type: challenge
 title: Update the Let's Quiz! application code
 teaser: We'll update the Let's Quiz! application home page to trigger the DevOps workflow
@@ -55,8 +55,17 @@ timelimit: 600
 ===
 All the logins use the same credentials.
 
->User: student<p>
->Password: learn_ansible
+User:
+
+```yaml
+student
+```
+
+Password:
+
+```yaml
+learn_ansible
+```
 
 👋 Introduction
 ===
@@ -300,11 +309,11 @@ If you have encountered an issue or have noticed something not quite right, plea
   h1 {
     font-size: 18px;
   }
-    h2 {
+  h2 {
     font-size: 16px;
     font-weight: 600
   }
-    h3 {
+  h3 {
     font-size: 14px;
     font-weight: 600
   }

tracks/devops-controller/04-controller-approval/assignment.md

@@ -1,6 +1,6 @@
 ---
 slug: controller-approval
-id: bzw9txnxhegk
+id: epk2lxvnwigp
 type: challenge
 title: Approve the application deployment in controller
 teaser: Finally, we'll approve the controller workflow to build a new release, configure
@@ -53,8 +53,17 @@ timelimit: 600
 ===
 All the logins use the same credentials.
 
->User: student<p>
->Password: learn_ansible
+User:
+
+```yaml
+student
+```
+
+Password:
+
+```yaml
+learn_ansible
+```
 
 👋 Introduction
 ===
@@ -346,7 +355,6 @@ If you have encountered an issue or have noticed something not quite right, plea
     display: flex;
   }
   .lightbox img {
-    /* max-height: 100% */
     max-width: 60%;
     max-height: 60%;
   }
@@ -358,11 +366,11 @@ If you have encountered an issue or have noticed something not quite right, plea
   h1 {
     font-size: 18px;
   }
-    h2 {
+  h2 {
     font-size: 16px;
     font-weight: 600
   }
-    h3 {
+  h3 {
     font-size: 14px;
     font-weight: 600
   }

tracks/devops-controller/05-devops-playground/assignment.md

@@ -1,6 +1,6 @@
 ---
 slug: devops-playground
-id: u7mqil4vqcpn
+id: iyeudnfeg2eb
 type: challenge
 title: Playground
 teaser: Use the remaining time to try it out yourself! This challenge has no checks
@@ -58,8 +58,17 @@ timelimit: 1200
 ===
 All the logins use the same credentials.
 
->User: student<p>
->Password: learn_ansible
+User:
+
+```yaml
+student
+```
+
+Password:
+
+```yaml
+learn_ansible
+```
 
 👋 Introduction
 ===
@@ -116,11 +125,11 @@ If you have encountered an issue or have noticed something not quite right, plea
   h1 {
     font-size: 18px;
   }
-    h2 {
+  h2 {
     font-size: 16px;
     font-weight: 600
   }
-    h3 {
+  h3 {
     font-size: 14px;
     font-weight: 600
   }
@@ -130,4 +139,4 @@ If you have encountered an issue or have noticed something not quite right, plea
   ul li span {
     font-size: 14px
   }
-</style>
+</style>

tracks/devops-controller/track.yml

@@ -1,9 +1,6 @@
 slug: devops-controller
 id: u5sh0k588dhx
 title: DevOps and CI/CD with automation controller
-teaser: In this lab, we’ll integrate a simple CI/CD pipeline into automation controller
-  to demonstrate how Ansible Automation Platform supports and elevates DevOps practices
-  across the enterprise.
 description: |-
   # DevOps and CI/CD with automation controller
   ***
@@ -25,20 +22,21 @@ description: |-
   * Creating a new application release, configuring a web server and deploying the updated *Let’s Quiz!* application with a [controller workflow](https://docs.ansible.com/automation-controller/latest/html/userguide/workflows.html).
   * Using a controller [approval](https://docs.ansible.com/automation-controller/4.2.0/html/userguide/workflow_templates.html#approval-nodes) to allow final checks and sign-off before deploying to production.
 icon: ./assets/img/automation_controller.png
-level: intermediate
 tags:
+- prod
 - controller
+- prodops
 - automation controller
-- devops
 - jenkins
-- dev
 owner: redhat
 developers:
 - [email protected]
 show_timer: true
 skipping_enabled: true
+idle_timeout: 1200
+timelimit: 3300
 lab_config:
   overlay: false
   width: 25
   position: right
-checksum: "2979691381968800584"
+checksum: "5048473118870256566"

tracks/devops-controller/track_scripts/setup-devops-controller

@@ -18,4 +18,6 @@ done
 
 # Testing Get instruqt lab content
 # /usr/bin/aws s3 sync --no-sign-request s3://tmm-instruqt-content.demoredhat.com.private/devops-controller-dev /opt/setup-scripts/devops-controller
-# ansible-playbook /opt/setup-scripts/devops-controller/setup-devops-controller.yml -i /opt/setup-scripts/devops-controller/inventory.ini --tags configure-repo
+# ansible-playbook /opt/setup-scripts/devops-controller/setup-devops-controller.yml -i /opt/setup-scripts/devops-controller/inventory.ini --tags configure-repo
+
+sed -ri 's/^(\s*)(ansible_host\s*:\s*devops-controller.*$)/\1ansible_host: devops-controller.'"${_SANDBOX_ID}"'.svc.cluster.local/' /opt/setup-scripts/devops-controller/inventory/inventory.yml