Skip to content

Commit 2c61033

Browse files
committed
Updating based on SME review
1 parent 26d3477 commit 2c61033

File tree

2 files changed

+16
-22
lines changed

2 files changed

+16
-22
lines changed

content/learn/vp_agof.adoc

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,20 @@ The webUI provides an intuitive interface to build, monitor, and manage automati
3636

3737
== Ansible framework methods
3838

39-
The three main methods for setting up an Ansible framework are as follows:
39+
The main methods for setting up an Ansible framework are as follows:
4040

41-
=== Method 1: AWS-based install
41+
[NOTE]
42+
====
43+
This section focussed mainly on the AWS based installation method.
44+
====
45+
46+
=== AWS based install
4247

4348
This method is ideal for organizations that prefer deploying AAP on AWS infrastructure. This default install process in AAP 2.4 uses AWS by default and offers a fully automated setup. It requires AWS credentials, builds an AWS image with Red Hat's ImageBuilder, and sets up AAP within an AWS VPC and subnet. The installation program creates all the necessary resources, including AAP Controllers and, optionally, additional components such as the Automation Hub.
4449

4550
This is the easiest method if you already use AWS, as it automates the provisioning of resources, including VMs and network configurations. This requires AWS infrastructure and credentials.
4651

47-
=== Method 2: Pre-configured VMs Install
48-
49-
This method allows the installation of AAP on pre-configured Red Hat Enterprise Linux (RHEL) VMs. You need to provide an inventory file that specifies details about the VMs or instances where AAP will be installed. It is designed for users with existing infrastructure who want to deploy AAP without depending on AWS. If you need to install a pattern on a cluster with a different topology than this, use the API install mechanism.
50-
51-
THis method is useful if you already have pre-configured VMs or bare-metal instances running RHEL. It allows greater flexibility and control over the environment. Using this method requires more manual effort to configure VMs and might need additional customization for non-standard topologies. This model has been tested with up to two RHEL VMs (one for AAP and one for Hub).
52-
53-
The requirements for this mode are as follows:
54-
55-
* Must be running a version of RHEL that AAP supports
56-
* Must be properly entitled with a subscription that makes the appropriate AAP repository available
57-
58-
=== Method 3: Custom Ansible controller (API install)
52+
=== Custom Ansible controller (API install)
5953

6054
In this method, you provide an existing Ansible Automation Platform (AAP) Controller endpoint, either on bare metal or in a private cloud, without needing AWS or pre-configured VMs. You specify the manifest, endpoint hostname, admin credentials, and pass the installation process to a predefined `controller_config_dir`. This is suitable for complex or custom topologies where you want full control over the deployment.
6155

@@ -196,7 +190,7 @@ Click the `Load token` link at https://console.redhat.com[console.redhat.com] >
196190
+
197191
[source,shell]
198192
----
199-
controller_license_src_file: '~/Downloads/manifest_<sub_allocation_name>_20240924T131518Z.zip'
193+
controller_license_src_file: '~/Downloads/<manifest_filename>.zip'
200194
manifest_content: "{{ lookup('file', controller_license_src_file) | b64encode }}"
201195
----
202196
+
@@ -205,9 +199,9 @@ manifest_content: "{{ lookup('file', controller_license_src_file) | b64encode }}
205199
[source,yaml]
206200
----
207201
---
208-
aws_account_nbr_vault: '293265215425'
209-
aws_access_key_vault: 'AKIAIJ6ZIKPAUZGF2643'
210-
aws_secret_key_vault: 'gMC3Jy3/MZtOosjUDHy0Nl/2mp2HQok1JDfCQGKUR'
202+
aws_account_nbr_vault: '<AWS_account_ID>'
203+
aws_access_key_vault: '<AWS_access_key>'
204+
aws_secret_key_vault: '<AWS_secret_key>'
211205
212206
pattern_prefix: 'foga'
213207
pattern_dns_zone: 'aws.validatedpatterns.io'
@@ -225,7 +219,7 @@ admin_password: 'redhat123!'
225219
manifest_content: "Content for a manifest file to entitle AAP Controller. See below for an example of how to point to a local file"
226220
#manifest_content: "{{ lookup('file', '~/Downloads/manifest_AVP_20230510T202608Z.zip') | b64encode }}"
227221
228-
org_number_vault: "1778713"
222+
org_number_vault: "<Org-ID>"
229223
activation_key_vault: "kevs-agof-key"
230224
231225
# Set these variables to provide your own AMI, or to re-use an AMI previously generated with this process
@@ -278,7 +272,7 @@ a| EDA Automation Controller
278272

279273
Once the install completes, you will have a project, an inventory (consisting of the AAP controller), a credential (the private key from ec2), a job template (which runs a fact gather on the AAP controller) and a schedule that will run the job template every 5 minutes,
280274

281-
. Log in to `https:{{ ec2_name_prefix }}.{{ domain }}:8443` with the username `admin` and the password as configured in `admin_password` field of `agof_vault.yml`.
275+
. Log in to `https://aap.{{ ec2_name_prefix }}.{{ domain }}:8443` with the username `admin` and the password as configured in `admin_password` field of `agof_vault.yml`.
282276

283277
. Under *Resources* > *Projects* verify the project *Ansible GitOps Framework Minimal Demo* is created with status *Successful*.
284278

content/learn/vp_agof_config_controller.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ This specifies the organization name stored in a vault for security purposes.
147147
This is the Ansible Controller's username stored in a vault.
148148

149149
*`controller_password_vault: '{{ admin_password }}'`*::
150-
The password is fetched dynamically from a vault for security purposes.
150+
The initial admin password that AAP is configured with to allow the controller_username to log in. This particular password is not retrieved from a vault.
151151

152152
=== Dynamic variables
153153

@@ -158,7 +158,7 @@ The Ansible Controller username is retrieved from the vault variable.
158158
The password is dynamically fetched from the vault.
159159

160160
=== Project configuration
161-
Projects are collections of playbooks that are stored in a Git repository or SCM. This section can define how projects are configured in the Controller.
161+
Projects are git repositories that can contain inventories and collections (and collections can contain playbooks).
162162

163163
*`agof_demo_project_name: 'Ansible GitOps Framework Minimal Demo'`*::
164164
This variable holds the name of the project being managed in the controller.

0 commit comments

Comments
 (0)