Skip to content
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.

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

Implement generic CaC subtasks retry for infra.controller_configuration.* role instantiations #2070

Merged
merged 4 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion provisioner/workshop_specific/auto_satellite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
image: quay.io/acme_corp/auto_satellite_ee:latest
tasks:
- name: Deploy controller-infra workloads
ansible.builtin.include_tasks: auto_satellite_cac_subtasks_init.yml
ansible.builtin.include_tasks: generic_cac_subtasks_init.yml
loop: "{{ controller_infra_workloads }}"
loop_control:
loop_var: controller_infra_vars
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

- name: "Display current loop role"
ansible.builtin.debug:
msg: "Begin auto_satellite CaC loop role: {{ controller_infra_vars }}"
msg: "Begin Controller CaC loop role: {{ controller_infra_vars }}"

- ansible.builtin.include_tasks: auto_satellite_cac_subtasks_retry.yml
- ansible.builtin.include_tasks: generic_cac_subtasks_retry.yml
...

Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
when: dynamic_retry_count | int == 5

- ansible.builtin.debug:
msg: "auto_satellite CaC {{ controller_infra_vars }} Task Group failed, retry count: {{ dynamic_retry_count }}"
msg: "Controller CaC {{ controller_infra_vars }} Task Group failed, retry count: {{ dynamic_retry_count }}"

- ansible.builtin.include_tasks: auto_satellite_cac_subtasks_retry.yml
- ansible.builtin.include_tasks: generic_cac_subtasks_retry.yml
...
29 changes: 2 additions & 27 deletions provisioner/workshop_specific/ripu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,37 +17,13 @@
controller_infra_workloads:
- redhat_cop.controller_configuration.credential_types
- redhat_cop.controller_configuration.projects
- infra.controller_configuration.project_update
- redhat_cop.controller_configuration.job_templates
controller_hostname: "https://{{ ansible_host }}"
controller_username: admin
controller_password: "{{ admin_password }}"
controller_validate_certs: false
controller_credential_types:
- name: Satellite_Collection
description: Credential for redhat.satellite collection
kind: cloud
inputs:
fields:
- type: string
id: username
label: Satellite Username
- type: string
id: password
label: Satellite Password
secret: true
- type: string
id: host
label: Satellite Hostname
required:
- username
- password
- host
injectors:
env:
FOREMAN_SERVER: !unsafe '{{ host }}'
FOREMAN_USER: !unsafe '{{ username}}'
FOREMAN_PASSWORD: !unsafe '{{ password }}'
FOREMAN_VALIDATE_CERTS: 'false'
- name: GitHub_Personal_Access_Token
description: Credential for GitHub repo operations automation
kind: cloud
Expand Down Expand Up @@ -97,8 +73,7 @@
validate_certs: false

- name: Deploy controller-infra workloads
include_role:
name: "{{ controller_infra_vars }}"
ansible.builtin.include_tasks: generic_cac_subtasks_init.yml
loop: "{{ controller_infra_workloads }}"
loop_control:
loop_var: controller_infra_vars
Expand Down