Skip to content

Commit

Permalink
Disable AAP2 section for now (#57)
Browse files Browse the repository at this point in the history 
Signed-off-by: Mario Vazquez <[email protected]>
  • Loading branch information
@mvazquezc
mvazquezc authored Aug 22, 2023
1 parent 002b17a commit 468a47a
Show file tree
Hide file tree
Showing 5 changed files with 268 additions and 256 deletions.
28 changes: 14 additions & 14 deletions documentation/modules/ROOT/nav.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,17 @@
** xref:policygen-deepdive.adoc#policies-templating[Policies Templating]
** xref:policygen-deepdive.adoc#kustomize-plugins-locally[Running Kustomize Plugins Locally]
* xref:integration-with-aap.adoc[Integration with Ansible Automation Platform]
** xref:integration-with-aap.adoc#aap-overview[AAP Overview]
*** xref:integration-with-aap.adoc#augmenting-openshift[Augmenting OpenShift with Ansible Automation]
*** xref:integration-with-aap.adoc#intro-to-aap-operator[Introduction to the AAP Operator]
** xref:integration-with-aap.adoc#aap-components[Defining Components]
*** xref:integration-with-aap.adoc#automation-hub[Automation Hub]
*** xref:integration-with-aap.adoc#automation-controller[Automation Controller]
*** xref:integration-with-aap.adoc#acm-hooks-toward-aap[ACM Hooks Toward AAP]
** xref:integration-with-aap.adoc#workflow-overview[Workflow Overview]
*** xref:integration-with-aap.adoc#general-workflow[General AAP Integration Workflow]
*** xref:integration-with-aap.adoc#lab-workflow[Lab AAP Integration Workflow]
//* xref:integration-with-aap.adoc[Integration with Ansible Automation Platform]
//** xref:integration-with-aap.adoc#aap-overview[AAP Overview]
//*** xref:integration-with-aap.adoc#augmenting-openshift[Augmenting OpenShift with Ansible Automation]
//*** xref:integration-with-aap.adoc#intro-to-aap-operator[Introduction to the AAP Operator]
//** xref:integration-with-aap.adoc#aap-components[Defining Components]
//*** xref:integration-with-aap.adoc#automation-hub[Automation Hub]
//*** xref:integration-with-aap.adoc#automation-controller[Automation Controller]
//*** xref:integration-with-aap.adoc#acm-hooks-toward-aap[ACM Hooks Toward AAP]
//** xref:integration-with-aap.adoc#workflow-overview[Workflow Overview]
//*** xref:integration-with-aap.adoc#general-workflow[General AAP Integration Workflow]
//*** xref:integration-with-aap.adoc#lab-workflow[Lab AAP Integration Workflow]

* xref:deployment-considerations.adoc[Deployment Considerations]
** xref:deployment-considerations.adoc#hardware-configurations[Hardware configurations]
Expand Down Expand Up @@ -145,7 +145,7 @@
** xref:running-the-deployment.adoc#deploying-ztp-gitops-pipeline[Deploying the ZTP GitOps Pipeline]
** xref:running-the-deployment.adoc#deploying-sno-using-gitops-pipeline[Deploying the SNO Cluster using the ZTP GitOps Pipeline]
* xref:adding-automation.adoc[Adding Automation]
//* xref:adding-automation.adoc[Adding Automation]
* xref:monitoring-the-deployment.adoc[Monitoring the Deployment]
** xref:monitoring-the-deployment.adoc#monitoring-deployment-webui[Monitoring the Deployment via the WebUI]
Expand All @@ -156,7 +156,7 @@
* xref:check-deployment-is-finished.adoc[Check SNO Deployment is finished]
** xref:check-deployment-is-finished.adoc#check-sno-deployment-webui[Check SNO Deployment has Finished via the WebUI]
** xref:check-deployment-is-finished.adoc#check-sno-deployment-cli[Check SNO Deployment has Finished via the CLI]
** xref:check-deployment-is-finished.adoc#ensure-automation-ran-successfully[Ensure AAP Automation Ran Successfully]
//** xref:check-deployment-is-finished.adoc#ensure-automation-ran-successfully[Ensure AAP Automation Ran Successfully]
* xref:using-talm-to-update-clusters.adoc[Using TALM to update clusters]
** xref:using-talm-to-update-clusters.adoc#verify-talm[Verifying the TALM state]
Expand Down Expand Up @@ -205,4 +205,4 @@
*** xref:lab-environment.adoc#configure-openshift-hub-cluster[Configure OpenShift Hub Cluster]
*** xref:lab-environment.adoc#deploy-openshift-hub-cluster-operators[Deploy OpenShift HUB Cluster Operators]
*** xref:lab-environment.adoc#deploy-sno1-cluster-without-ztp[Deploy SNO1 Cluster (without ZTP)]
*** xref:lab-environment.adoc#configure-aap[Configure AAP]
//*** xref:lab-environment.adoc#configure-aap[Configure AAP]
52 changes: 26 additions & 26 deletions documentation/modules/ROOT/pages/check-deployment-is-finished.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,29 +68,29 @@ ztp-policies.sno2-site-policies inform Compliant
3. At this point the SNO is ready to run 5G RAN workloads.
[#ensure-automation-ran-successfully]
== Ensure AAP Automation Ran Successfully

Now that SNO deployment is finished, automation should run as soon as the cluster is marked with the `ztp-done` label. We can easily check the labels on our `sno2` cluster via the OpenShift web console, under the `Infrastructure` > `Clusters` tab.

image::sno2-labels.png[SNO2 Labels]

There are a couple ways to ensure automation has run successfully.

First, the Ansible job template used in this lab was configured to add an `aap-done` label to a cluster after it has run automation on it successfully, so notice that our `sno2` cluster now has the label `aap-done`.

image::sno2-aap-done.png[SNO2 AAP Done Label]

Additionally, under the Applications tab on our OpenShift web console, if we search for `monitor-ztp-done`, we will see our automation Application. Let's take a look at this Application by clicking on its name. Notice the green check next to `Cluster resource status`, indicating automation has ran successfully. Now, navigating to the Topology tab we see a visual representation of the automation that has ran.

image::aap-app.png[AAP Application]

image::aap-app-topology.png[AAP Topology]

Lastly, to view status and logs for the actual Ansible Controller job that ran, we can navigate to https://automation-aap.apps.hub.5g-deployment.lab, click on the "Jobs" tab, and view the latest job that ran.

image::aap-jobs.png[AAP Jobs]

image::aap-single-job.png[Single AAP Job]

NOTE: Running automation on `local-cluster` and `sno1` was not a focus of this lab, but since `local-cluster` was also deployed via a ZTP workflow and `sno1` was imported into RHACM, they will have `ztp-done` labels and our application will run automation on these clusters as well. This model of maintaing one automation application for day 2 operations for N clusters makes utilizing ZTP and AAP automation together in a 5G RAN environment great at scale while also maintaining configuration control, as controlling which clusters run automation is as simple as adjusting the automation application's PlacementRule.
//[#ensure-automation-ran-successfully]
//== Ensure AAP Automation Ran Successfully
//
//Now that SNO deployment is finished, automation should run as soon as the cluster is marked with the `ztp-done` label. We can easily check the labels on our `sno2` cluster via the OpenShift web console, under the `Infrastructure` > `Clusters` tab.
//
//image::sno2-labels.png[SNO2 Labels]
//
//There are a couple ways to ensure automation has run successfully.
//
//First, the Ansible job template used in this lab was configured to add an `aap-done` label to a cluster after it has run automation on it successfully, so notice that our `sno2` cluster now has the label `aap-done`.
//
//image::sno2-aap-done.png[SNO2 AAP Done Label]
//
//Additionally, under the Applications tab on our OpenShift web console, if we search for `monitor-ztp-done`, we will see our automation Application. Let's take a look at this Application by clicking on its name. Notice the green check next to `Cluster resource status`, indicating automation has ran successfully. Now, navigating to the Topology tab we see a visual representation of the automation that has ran.
//
//image::aap-app.png[AAP Application]
//
//image::aap-app-topology.png[AAP Topology]
//
//Lastly, to view status and logs for the actual Ansible Controller job that ran, we can navigate to https://automation-aap.apps.hub.5g-deployment.lab, click on the "Jobs" tab, and view the latest job that ran.
//
//image::aap-jobs.png[AAP Jobs]
//
//image::aap-single-job.png[Single AAP Job]
//
//NOTE: Running automation on `local-cluster` and `sno1` was not a focus of this lab, but since `local-cluster` was also deployed via a ZTP workflow and `sno1` was imported into RHACM, they will have `ztp-done` labels and our application will run automation on these clusters as well. This model of maintaing one automation application for day 2 operations for N clusters makes utilizing ZTP and AAP automation together in a 5G RAN environment great at scale while also maintaining configuration control, as controlling which clusters run automation is as simple as adjusting the automation application's PlacementRule.
3 changes: 3 additions & 0 deletions documentation/modules/ROOT/pages/index.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ IMPORTANT: This is not an official Red Hat Training. Please, contact with your R
|Alberto Losada
|Lab Developer / Maintainer

|Ethan Siegel
|Lab Contributor

|Ian Miller
|Lab Contributor / CNF Developer

Expand Down
Loading

0 comments on commit 468a47a

Please sign in to comment.