improvement

modules/LABENV/pages/index.adoc

@@ -10,6 +10,9 @@ image::lab.png[]
 . **Click** on the catalog entry in the search results.
 . On the catalog page, **click** the **Order** button.
 . **Fill out** the required details in the order form.
++
+image::form.png[]
+
 . **Review the warning** at the bottom of the form and **check the box** labeled: +
    *“I confirm that I understand the above warnings.”*
 . **Click** the **Order** button to place your lab order.
@@ -25,6 +28,6 @@ image::lab.png[]
 
 [[RHDP-Portal-Links]]
 === RHDP Portal Links
-- RedHat associates: https://demo.redhat.com/[https://demo.redhat.com/,window=_blank]
+- RedHat associates: https://catalog.demo.redhat.com/catalog?search=awx[https://demo.redhat.com/,window=_blank]
 - RedHat partners: https://partner.demo.redhat.com/[https://partner.demo.redhat.com/,window=_blank]
 

modules/chapter1/pages/section2.adoc

@@ -1,4 +1,4 @@
-= WWhat’s the benefit of using AAP over AWX?
+= What’s the benefit of using AAP over AWX?
 
 In order to do the migration its important to understand why the migration is needed. So here are the key reason why the Ansible Automation platform is better for enterprise.  
 

modules/chapter1/pages/section3.adoc

@@ -4,6 +4,8 @@ The following Video will cover the step-to-step guide to deploy the AWX operator
 
 video::awx_deployment.mp4[align="center",width=700,height=400]
 
+Note: If deployed `Migrate from AWX to AAP 2.5 (AWS)` While doing the login to Openshift click on `htpasswd_provider` to login using user `admin`.
+
 . First create a clone of the awx-operator github repo:
 +
 [source,bash,role=execute]
@@ -37,17 +39,17 @@ make deploy
 +
 .Sample output:
 ----
-  apiVersion: kustomize.config.k8s.io/v1beta1
-  kind: Kustomization
-  resources:
-  # Find the latest tag here: https://github.com/ansible/awx-operator/releases
-   - github.com/ansible/awx-operator/config/default?ref=<tag>
-  # Set the image tags to match the git version from above
-  images:
-   - name: quay.io/ansible/awx-operator
-     newTag: <tag>
-  # Specify a custom namespace in which to install AWX
-  namespace: awx
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+# Find the latest tag here: https://github.com/ansible/awx-operator/releases
+  - github.com/ansible/awx-operator/config/default?ref=<tag>
+# Set the image tags to match the git version from above
+images:
+  - name: quay.io/ansible/awx-operator
+    newTag: <tag>
+# Specify a custom namespace in which to install AWX
+namespace: awx
 ----
 
 . Apply the changes of the `kustomization.yaml` file by running this:
@@ -81,13 +83,13 @@ oc apply -k .
 +
 .Sample output:
 ----
-  apiVersion: awx.ansible.com/v1beta1
-  kind: AWX
-  metadata:
-   name: awx-demo
-  spec:
-   service_type: clusterip
-   ingress_type: Route
+apiVersion: awx.ansible.com/v1beta1
+kind: AWX
+metadata:
+  name: awx-demo
+spec:
+  service_type: clusterip
+  ingress_type: Route
 ----
 
 . Make sure to add this new file to the list of resources in your `kustomization.yaml` file:

modules/chapter1/pages/section5.adoc

@@ -31,86 +31,35 @@ oc config set-context --current --namespace=awx
 [source,bash,role=execute]
 ----
 export AWX_NAMESPACE=awx
-----
-
-+
-[source,bash,role=execute]
-----
 export AWX_NAME=awx-demo
-----
-
-+
-[source,bash,role=execute]
-----
 export AWX_DB_NAME=$(oc get secret -n $AWX_NAMESPACE $AWX_NAME-postgres-configuration -o jsonpath={.data.database} | base64 -d)
-----
-
-+
-[source,bash,role=execute]
-----
 export AWX_DB_HOST=$(oc get secret -n $AWX_NAMESPACE $AWX_NAME-postgres-configuration -o jsonpath={.data.host} | base64 -d)
-----
-
-+
-[source,bash,role=execute]
-----
 export AWX_DB_PASSWORD=$(oc get secret -n $AWX_NAMESPACE $AWX_NAME-postgres-configuration -o jsonpath={.data.password} | base64 -d)
-----
-
-+
-[source,bash,role=execute]
-----
 export AWX_DB_PORT=$(oc get secret -n $AWX_NAMESPACE $AWX_NAME-postgres-configuration -o jsonpath={.data.port} | base64 -d)
-----
-
-+
-[source,bash,role=execute]
-----
 export AWX_DB_USERNAME=$(oc get secret -n $AWX_NAMESPACE $AWX_NAME-postgres-configuration -o jsonpath={.data.username} | base64 -d)
 ----
 
 +
 [source,bash,role=execute]
 ----
 export AUTOMATION_CONTROLLER_NAME=aap
-----
-
-+
-[source,bash,role=execute]
-----
 export AUTOMATION_CONTROLLER_NAMESPACE=awx
-----
-
-+
-[source,bash,role=execute]
-----
 export AUTOMATION_CONTROLLER_DB_NAME=$(oc get secret -n $AUTOMATION_CONTROLLER_NAMESPACE $AUTOMATION_CONTROLLER_NAME-controller-postgres-configuration -o jsonpath={.data.database} | base64 -d)
-----
-
-+
-[source,bash,role=execute]
-----
 export AUTOMATION_CONTROLLER_DB_PASSWORD=$(oc get secret -n $AUTOMATION_CONTROLLER_NAMESPACE $AUTOMATION_CONTROLLER_NAME-controller-postgres-configuration -o jsonpath={.data.password} | base64 -d)
-----
-
-+
-[source,bash,role=execute]
-----
 export AUTOMATION_CONTROLLER_DB_PORT=$(oc get secret -n $AUTOMATION_CONTROLLER_NAMESPACE $AUTOMATION_CONTROLLER_NAME-controller-postgres-configuration -o jsonpath={.data.port} | base64 -d)
-----
-
-+
-[source,bash,role=execute]
-----
 export AUTOMATION_CONTROLLER_DB_USERNAME=$(oc get secret -n $AUTOMATION_CONTROLLER_NAMESPACE $AUTOMATION_CONTROLLER_NAME-controller-postgres-configuration -o jsonpath={.data.username} | base64 -d)
+export AUTOMATION_CONTROLLER_DB_HOST=$(oc get secret -n $AUTOMATION_CONTROLLER_NAMESPACE $AUTOMATION_CONTROLLER_NAME-controller-postgres-configuration -o jsonpath={.data.host} | base64 -d)
 ----
-
++
+Note: Please run the following command and verify the environment variables are set correctly before proceeding to next steps: 
 +
 [source,bash,role=execute]
 ----
-export AUTOMATION_CONTROLLER_DB_HOST=$(oc get secret -n $AUTOMATION_CONTROLLER_NAMESPACE $AUTOMATION_CONTROLLER_NAME-controller-postgres-configuration -o jsonpath={.data.host} | base64 -d)
+env | grep -i awx
+env | grep -i automation
 ----
 
+
 . Run the following command to enter the AWX postgres database container:
 +
 [source,bash,role=execute]