Skip to content

feat: allow AAP2 manifest injection via internal service URL #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tonykay wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: allow AAP2 manifest injection via internal service URL #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions roles/ocp4_workload_ansible_automation_platform/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ ocp4_workload_ansible_automation_platform_token_lifecycle_retries: 5
ocp4_workload_ansible_automation_platform_deploy_wait_timeout: 1800
ocp4_workload_ansible_automation_platform_manifest_inject_retries: 3
ocp4_workload_ansible_automation_platform_manifest_inject_delay: 5
# Override to use an internal service URL for manifest injection.
# When set, bypasses the external route hostname (useful when ingress
# is slow to come up or unreachable from the deployer pod).
# Example: "aap.aap.svc.cluster.local"
ocp4_workload_ansible_automation_platform_manifest_inject_host: ""
ocp4_workload_ansible_automation_platform_manifest_inject_validate_certs: true
# Additional manifest overrides to be merged into the Template used to deploy AAP
ocp4_workload_ansible_automation_platform_aap_manifest_overrides: {}

Expand Down
7 changes: 5 additions & 2 deletions roles/ocp4_workload_ansible_automation_platform/tasks/workload.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,13 @@
- name: Inject AAP2 Controller manifest
ansible.controller.license:
manifest: /tmp/aap-manifest.zip
controller_host: "{{ automation_controller_hostname }}"
controller_host: >-
{{ ocp4_workload_ansible_automation_platform_manifest_inject_host
if ocp4_workload_ansible_automation_platform_manifest_inject_host | default('') | length > 0
else automation_controller_hostname }}
controller_username: admin
controller_password: "{{ _ocp4_workload_ansible_automation_platform_admin_password }}"
validate_certs: true
validate_certs: "{{ ocp4_workload_ansible_automation_platform_manifest_inject_validate_certs }}"
register: r_aap_license
until: not r_aap_license.failed
retries: "{{ ocp4_workload_ansible_automation_platform_manifest_inject_retries }}"
Expand Down
Loading