Fix conflict issue operating aap 2.6 #4118
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…#3907) Update Containerized installation for AAP 2.6 https://issues.redhat.com/browse/AAP-48592
…3912) (ansible#3913) Create AAP 2.6 inventory files for Tested deployment models https://issues.redhat.com/browse/AAP-47926
Updated 2.4 to 2.6
) DITA pre-migration tasks. Security automation Guide https://issues.redhat.com/browse/AAP-49630
Configuring automation execution - Update backup and restore note to ensure clarity regarding the latest version prerequisite https://issues.redhat.com/browse/AAP-46263
) Update Tested deployment models for AAP 2.6 https://issues.redhat.com/browse/AAP-47918
ansible#3937) * Adding callback URL field info to OIDC auth section [DOCS] Generic OIDC Authenticator Does Not Provide a Callback URL https://issues.redhat.com/browse/AAP-49860 Affects `titles/central-auth` * Tech review edit
Configuring automation execution UI and modular compliance chapter 8 https://issues.redhat.com/browse/AAP-46725
* Adjusting wording for 2.6 version * PR suggestions
…nsible#3948) Containerized installation - Update backup & restore procedures to ensure clarity regarding the latest version prerequisite https://issues.redhat.com/browse/AAP-46266
Incorrect Controller version in documentation https://issues.redhat.com/browse/AAP-44204
Configuring automation execution UI and modular compliance chapter 9 https://issues.redhat.com/browse/AAP-46726
Include specific reference to AWS Managed coverage within automation mesh docs for operator-based envs. https://issues.redhat.com/browse/AAP-50358
Broken Link Report July 21 2025 https://issues.redhat.com/browse/AAP-50562 LGTM
Affected titles: - `titles/aap-containerized-install` - `titles/topologies` - `titles/aap-migration` - `titles/troubleshooting-aap` Ansible DITA readiness (2025-07-09) - Michelle https://issues.redhat.com/browse/AAP-49393
…ion decisions) (ansible#3875) (ansible#3974) * AAP-49612 Updated xref to link in assembly-eda-credential-types.adoc * AAP-49612 Replaced two xrefs with link tagging in DE section * AAP-49612 Changed xref to link in rulebook activations assembly * AAP-49612 Replaced xrefs with links in RHAAP credential for migration prep * AAP-49612 Replaced xrefs with links in EDA user guide overview - migration prep * AAP-49612 Replaced xrefs w/ links in Additional resources of overview * AAP-49612 Migration prep - fix tagging that causes Vale validations * AAP-49612 Updated add'l resources sections for migration prep * AAP-49612 Migration prep - updated Add'l resources to links only * AAP-49612 Migration prep - updated Add'l resources to links only, no period * Revert "AAP-49612 Migration prep - fix tagging that causes Vale validations" This reverts commit ef460ca. Changes to be committed: modified: downstream/archive/archived-assemblies/eda/assembly-ansible-rulebooks.adoc modified: downstream/archive/archived-assemblies/eda/assembly-installation-eda-controller.adoc modified: downstream/archive/archived-assemblies/eda/assembly-using-eda-controller.adoc * AAP-49612 Migration prep - updates to multiple file * AAP-49612 Tweaked Example block title for Event filter plugins chapter * AAP-49612 Tweaked Example block title for Event filter plugins chapter
* DITA migration changes: CAG Ch12 Configuring automation execution UI and modular compliance chapter 12 https://issues.redhat.com/browse/AAP-46732 * DITA migration changes: CAG Ch12 Correction Configuring automation execution UI and modular compliance chapter 12 https://issues.redhat.com/browse/AAP-46732
Resolves:AAP-49775
Document update for containerised AAP 2.5 custom Redis Cluster certificate https://issues.redhat.com/browse/AAP-48450
Configuring automation execution UI and modular compliance chapter 13 https://issues.redhat.com/browse/AAP-46733
Adds a Container details table to Containerized installation guide Containerized installation - update "Diagnosing the problem" with a mapping of container names and their usage https://issues.redhat.com/browse/AAP-42439
RPM installer - update nginx_tls_protocols default value in documentation https://issues.redhat.com/browse/AAP-48089
* DITA Readiness - DevTools * PR suggestion
Configuring automation execution modular compliance chapter 17 https://issues.redhat.com/browse/AAP-46737 Affects titles/controller-admin-guide
Configuring automation execution UI and modular compliance chapter 16 https://issues.redhat.com/browse/AAP-46736
* Added new title for Automation Dashboard Co-authored-by: Elizabeth Murtough <114593312+emurtoug@users.noreply.github.com>
…P documentation (ansible#4028) (ansible#4054) * AAP-49985 Removed eda maximum running activations from appendices * AAP-49985 Removal of EDA max simultaneous activations from Using automation decisions * AAP-49985 Removed sections on maximum simultaneous activations from workload topics * AAP-49985 Removed EDA max simultaneous running activations content from EDA performance chapter * AAP-49985 Removed modules related to eda max activations and updated concept module * AAP-49985 Final deletions of eda max activations content from the EDA user guide * AAP-49985 Remove hidden comment; permanently deleted paragraph * AAP-49985 Final tweak to sentence in EDA requirements
…oving high availability (ansible#4035) (ansible#4055)
…sible#4060) Containerized and RPM Installer Docs - Document postgresql_extra_settings inventory variable https://issues.redhat.com/browse/AAP-50483
…ansible#4062) Adds the new disconnected install assembly to Containerized installation Containerized installation for Ansible Automation Platform doesn't have any info related to the preparation of the disconnected base operating system https://issues.redhat.com/browse/AAP-49731
* DITA Readiness - Navigator modules * PR fix
Affects title: `titles/controller/controller-admin-guide` [Docs] Improve documentation regarding logs in containerized AAP installation https://issues.redhat.com/browse/AAP-48586
* Correct links for 2.6 controller docs Broken Link Report August 4 2025 https://issues.redhat.com/browse/AAP-51442 * Correct links for 2.6 Controller docs. Corrections Broken Link Report August 4 2025 https://issues.redhat.com/browse/AAP-51442 * Correct links for 2.6 Controller docs Correction https://issues.redhat.com/browse/AAP-51442
* Editing access management files for DITA Chapter 3 & 4 Access management and authentication https://issues.redhat.com/browse/AAP-51507 Affects `titles/central-auth` * Completing DITA prep for chapters 3 and 4 * Fixing typo * Peer review edit
* Editing access management files for DITA Chapter 5,6 & 7 Access management and authentication https://issues.redhat.com/browse/AAP-51509 Affects titles/central-auth * Final DITA edits in PR * Peer review edit
Correct error with conditionals for DITA migration https://issues.redhat.com/browse/AAP-51625
…ropriate assembly (ansible#4080) (ansible#4082)
…s on rulebook activations (ansible#4083) (ansible#4085) * AAP-41466-B Updated content for editing projects, including SC URL and the impact * AAP-41466-B Corrected formatting for Important admonition
…d for EDA projects (ansible#4087) (ansible#4088) * AAP-51751 Corrected Source control URL and add'l update to SC credential * AAP-51751 Tweaked the source control credential to ensure accuracy
…sible#4091) (ansible#4093) * Completed tasks for DITA pre-migration * Fixed link formatting
* Changes to system and gateway settings Changes to system settings [Docs] Document CSRF Trusted Origins feature and how to configure vanity URL in AAP https://issues.redhat.com/browse/AAP-47498 * Changes to system and gateway settings More changes to gateway settings [Docs] Document CSRF Trusted Origins feature and how to configure vanity URL in AAP https://issues.redhat.com/browse/AAP-47498 * Changes to system and gateway settings Correction [Docs] Document CSRF Trusted Origins feature and how to configure vanity URL in AAP https://issues.redhat.com/browse/AAP-47498 * Changes to system and gateway settings Corrections and fix xrefs [Docs] Document CSRF Trusted Origins feature and how to configure vanity URL in AAP https://issues.redhat.com/browse/AAP-47498 * Changes to system and gateway settings Correction [Docs] Document CSRF Trusted Origins feature and how to configure vanity URL in AAP https://issues.redhat.com/browse/AAP-47498
…nsible#4106) * AAP-46850 Document external credential support in EDA * AAP-46850 Minor fixes for peer review * AAP-46850 Fixed title in last link in external credentials module * AAP-46850 Fixed title in last link in external credentials module
* Updating RHEM container image build [Docs] Update Containerfile in RHEM doc https://issues.redhat.com/browse/AAP-50654 Affects `titles/edge-manager-user-guide` * Removing remaining `rhacm` mentions * Tech review edits
…sible#4112) Adds automationgateway_uwsgi_processes (RPM) and gateway_uwsgi_processes (Cont) to inventory vars appendix Affects: Containerized installation and RPM installation Document automationgateway_uwsgi_processes parameter in rpm installer https://issues.redhat.com/browse/AAP-52025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.