Merge branch 'devel' into patch-3

redhat-cop · Dec 14, 2024 · a973653 · a973653
2 parents b8137db + d356068
commit a973653
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/ansible-community/ansible-lint.git
-    rev: v24.12.1
+    rev: v24.12.2
     hooks:
       # see discussions here about what arguments are used, and behavior
       # https://github.com/ansible/ansible-lint/issues/649

diff --git a/CONVERSION_GUIDE.md b/CONVERSION_GUIDE.md
@@ -192,9 +192,9 @@ This is the format that is used for each using the appropriate prefix
 
 Prefixes
 
-- controller_configuration
-- ah_configuration
-- gateway
+- controller_configuration_
+- ah_configuration_
+- gateway_
 - eda_configuration_
 
 Format:

diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ The awx.awx or ansible.controller collection must be invoked in the playbook in
 The following command will invoke the collection playbook. This is considered a starting point for the collection.
 
 ```console
-ansible-playbook infra.aap_configuration.configure_controller.yml
+ansible-playbook infra.aap_configuration.configure_aap.yml
 ```
 
 Otherwise it will look for the modules only in your base installation. If there are errors complaining about "couldn't resolve module/action" this is the most likely cause.

diff --git a/roles/controller_credential_input_sources/README.md b/roles/controller_credential_input_sources/README.md
@@ -132,7 +132,7 @@ controller_credential_input_sources:
       secret_path: vault/path/to/gitlab/secret
       auth_path: approle
       secret_key: GITLAB_PASSWORD_FROM_HASHI_VAULT
-      secret_version
+      secret_version: v2
     description: Fill the gitlab credential from HashiCorp Vault
   - source_credential: cyberark
     target_credential: gitlab