Skip to content

Commit 6d92936

Browse files
authored
Merge pull request #302 from sean-m-sullivan/add_galaxy
Add async workaround
2 parents 10a8b70 + 09f9bf5 commit 6d92936

File tree

28 files changed

+110
-2
lines changed

28 files changed

+110
-2
lines changed

changelogs/fragments/async.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
bugfixes:
3+
- Fixes async to work on default execution enviroments.
4+
...

changelogs/fragments/inventories.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
bugfixes:
3-
- Fixes inventories hardcoded 'no_log: true' on the async job check task.
3+
- Fixes inventories hardcoded 'no_log' true on the async job check task.
44
...

examples/configure_controller.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
validate_certs: "{{ controller_validate_certs }}"
2222
register: result
2323
until: result.status == 200
24-
retries: 80
24+
retries: 20
2525
delay: 30
2626
ignore_errors: true
2727

roles/applications/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
poll: 0
2727
register: __applications_job_async
2828
changed_when: not __applications_job_async.changed
29+
vars:
30+
ansible_async_dir: '/tmp/.ansible_async'
2931

3032
- name: "Create Applications | Wait for finish the Applications creation"
3133
async_status:
@@ -39,4 +41,6 @@
3941
loop_var: __applications_job_async_results_item
4042
when: __applications_job_async_results_item.ansible_job_id is defined
4143
no_log: "{{ controller_configuration_applications_secure_logging }}"
44+
vars:
45+
ansible_async_dir: '/tmp/.ansible_async'
4246
...

roles/credential_input_sources/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
poll: 0
2424
register: __credential_input_sources_job_async
2525
changed_when: not __credential_input_sources_job_async.changed
26+
vars:
27+
ansible_async_dir: '/tmp/.ansible_async'
2628

2729
- name: "Create Controller Credential Input Sources | Wait for finish the Controller Credential Input Sources creation"
2830
async_status:
@@ -36,4 +38,6 @@
3638
loop_var: __credential_input_sources_job_async_results_item
3739
when: __credential_input_sources_job_async_results_item.ansible_job_id is defined
3840
no_log: "{{ controller_configuration_credential_input_sources_secure_logging }}"
41+
vars:
42+
ansible_async_dir: '/tmp/.ansible_async'
3943
...

roles/credential_types/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
poll: 0
2424
register: __credentialTypes_job_async
2525
changed_when: not __credentialTypes_job_async.changed
26+
vars:
27+
ansible_async_dir: '/tmp/.ansible_async'
2628

2729
- name: "Configure Controller Credential Types | Wait for finish the credential types creation"
2830
async_status:
@@ -36,4 +38,6 @@
3638
loop_var: __credentialTypes_job_async_result_item
3739
when: __credentialTypes_job_async_result_item.ansible_job_id is defined
3840
no_log: "{{ controller_configuration_credential_types_secure_logging }}"
41+
vars:
42+
ansible_async_dir: '/tmp/.ansible_async'
3943
...

roles/credentials/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
poll: 0
2929
register: __credentials_job_async
3030
changed_when: not __credentials_job_async.changed
31+
vars:
32+
ansible_async_dir: '/tmp/.ansible_async'
3133

3234
- name: "Configure Controller Credentials | Wait for finish the credential creation"
3335
async_status:
@@ -41,4 +43,6 @@
4143
loop_var: __credentials_job_async_results_item
4244
when: __credentials_job_async_results_item.ansible_job_id is defined
4345
no_log: "{{ controller_configuration_credentials_secure_logging }}"
46+
vars:
47+
ansible_async_dir: '/tmp/.ansible_async'
4448
...

roles/execution_environments/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
poll: 0
2727
register: __execution_environments_job_async
2828
changed_when: not __execution_environments_job_async.changed
29+
vars:
30+
ansible_async_dir: '/tmp/.ansible_async'
2931

3032
- name: "Create Controller Execution Environments | Wait for finish the Controller Execution Environments creation"
3133
async_status:
@@ -39,4 +41,6 @@
3941
loop_var: __execution_environments_job_async_results_item
4042
when: __execution_environments_job_async_results_item.ansible_job_id is defined
4143
no_log: "{{ controller_configuration_execution_environments_secure_logging }}"
44+
vars:
45+
ansible_async_dir: '/tmp/.ansible_async'
4246
...

roles/groups/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
poll: 0
2828
register: __group_job_async
2929
changed_when: not __group_job_async.changed
30+
vars:
31+
ansible_async_dir: '/tmp/.ansible_async'
3032

3133
- name: "Create Controller Group | Wait for finish the Controller Group creation"
3234
async_status:
@@ -40,4 +42,6 @@
4042
loop_var: __group_job_async_results_item
4143
when: __group_job_async_results_item.ansible_job_id is defined
4244
no_log: "{{ controller_configuration_group_secure_logging }}"
45+
vars:
46+
ansible_async_dir: '/tmp/.ansible_async'
4347
...

roles/hosts/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
poll: 0
2525
register: __host_job_async
2626
changed_when: not __host_job_async.changed
27+
vars:
28+
ansible_async_dir: '/tmp/.ansible_async'
2729

2830
- name: "Configure Controller Hosts | Wait for finish the Hosts creation"
2931
async_status:
@@ -37,4 +39,6 @@
3739
loop_var: __host_job_async_results_item
3840
when: __host_job_async_results_item.ansible_job_id is defined
3941
no_log: "{{ controller_configuration_hosts_secure_logging }}"
42+
vars:
43+
ansible_async_dir: '/tmp/.ansible_async'
4044
...

roles/instance_groups/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
poll: 0
3030
register: __instance_groups_job_async
3131
changed_when: not __instance_groups_job_async.changed
32+
vars:
33+
ansible_async_dir: '/tmp/.ansible_async'
3234

3335
- name: "Configure Controller instance groups | Wait for finish the instance groups creation"
3436
async_status:
@@ -42,4 +44,6 @@
4244
loop_var: __instance_groups_job_async_results_item
4345
when: __instance_groups_job_async_results_item.ansible_job_id is defined
4446
no_log: "{{ controller_configuration_instance_groups_secure_logging }}"
47+
vars:
48+
ansible_async_dir: '/tmp/.ansible_async'
4549
...

roles/inventories/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
poll: 0
2727
register: __inventories_job_async
2828
changed_when: not __inventories_job_async.changed
29+
vars:
30+
ansible_async_dir: '/tmp/.ansible_async'
2931

3032
- name: "Create Controller inventories | Wait for finish the inventories creation"
3133
async_status:
@@ -39,4 +41,6 @@
3941
loop_var: __inventories_job_async_result_item
4042
when: __inventories_job_async_result_item.ansible_job_id is defined
4143
no_log: "{{ controller_configuration_inventories_secure_logging }}"
44+
vars:
45+
ansible_async_dir: '/tmp/.ansible_async'
4246
...

roles/inventory_source_update/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
poll: 0
2828
register: __inventory_source_update_async
2929
changed_when: not __inventory_source_update_async.changed
30+
vars:
31+
ansible_async_dir: '/tmp/.ansible_async'
3032

3133
- name: "Configure Inventory Source | Wait for finish the Inventory Source creation"
3234
async_status:
@@ -40,4 +42,6 @@
4042
loop_var: __inventory_source_update_async_results_item
4143
when: __inventory_source_update_async_results_item.ansible_job_id is defined
4244
no_log: "{{ controller_configuration_inventory_source_update_secure_logging }}"
45+
vars:
46+
ansible_async_dir: '/tmp/.ansible_async'
4347
...

roles/inventory_sources/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
poll: 0
4444
register: __inventory_source_job_async
4545
changed_when: not __inventory_source_job_async.changed
46+
vars:
47+
ansible_async_dir: '/tmp/.ansible_async'
4648

4749
- name: "Configure Inventory Source | Wait for finish the Inventory Source creation"
4850
async_status:
@@ -56,4 +58,6 @@
5658
loop_var: __inventory_source_job_async_results_item
5759
when: __inventory_source_job_async_results_item.ansible_job_id is defined
5860
no_log: "{{ controller_configuration_inventory_sources_secure_logging }}"
61+
vars:
62+
ansible_async_dir: '/tmp/.ansible_async'
5963
...

roles/job_templates/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
poll: 0
6767
register: __job_temaplates_job_async
6868
changed_when: not __job_temaplates_job_async.changed
69+
vars:
70+
ansible_async_dir: '/tmp/.ansible_async'
6971

7072
- name: "Configure Controller Job Templates | Wait for finish the job templates creation"
7173
async_status:
@@ -79,4 +81,6 @@
7981
loop_var: __job_temaplates_job_async_result_item
8082
when: __job_temaplates_job_async_result_item.ansible_job_id is defined
8183
no_log: "{{ controller_configuration_job_templates_secure_logging }}"
84+
vars:
85+
ansible_async_dir: '/tmp/.ansible_async'
8286
...

roles/labels/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
poll: 0
2222
register: __controller_label_job_async
2323
changed_when: not __controller_label_job_async.changed
24+
vars:
25+
ansible_async_dir: '/tmp/.ansible_async'
2426

2527
- name: "Configure Labels | Wait for finish the Label creation"
2628
async_status:
@@ -34,4 +36,6 @@
3436
loop_var: __controller_label_job_async_results_item
3537
when: __controller_label_job_async_results_item.ansible_job_id is defined
3638
no_log: "{{ controller_configuration_labels_secure_logging }}"
39+
vars:
40+
ansible_async_dir: '/tmp/.ansible_async'
3741
...

roles/master_role_example/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
poll: 0
2424
register: __controller_***********_job_async
2525
changed_when: not __controller_***********_job_async.changed
26+
vars:
27+
ansible_async_dir: '/tmp/.ansible_async'
2628

2729
- name: "Configure *********** | Wait for finish the *********** creation"
2830
async_status:
@@ -36,4 +38,6 @@
3638
loop_var: __controller_***********_job_async_results_item
3739
when: __controller_***********_job_async_results_item.ansible_job_id is defined
3840
no_log: "{{ controller_configuration_*******_secure_logging }}"
41+
vars:
42+
ansible_async_dir: '/tmp/.ansible_async'
3943
...

roles/notification_templates/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
poll: 0
2727
register: __controller_notification_job_async
2828
changed_when: not __controller_notification_job_async.changed
29+
vars:
30+
ansible_async_dir: '/tmp/.ansible_async'
2931

3032
- name: "Configure notifications | Wait for finish the notifications creation"
3133
async_status:
@@ -39,4 +41,6 @@
3941
loop_var: __controller_notification_job_async_results_item
4042
when: __controller_notification_job_async_results_item.ansible_job_id is defined
4143
no_log: "{{ controller_configuration_notifications_secure_logging }}"
44+
vars:
45+
ansible_async_dir: '/tmp/.ansible_async'
4246
...

roles/organizations/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
poll: 0
3030
register: __organizations_job_async
3131
changed_when: not __organizations_job_async.changed
32+
vars:
33+
ansible_async_dir: '/tmp/.ansible_async'
3234

3335
- name: "Configure Controller Organizations | Wait for finish the organization creation"
3436
async_status:
@@ -42,4 +44,6 @@
4244
loop_var: __organizations_job_async_results_item
4345
when: __organizations_job_async_results_item.ansible_job_id is defined
4446
no_log: "{{ controller_configuration_organizations_secure_logging }}"
47+
vars:
48+
ansible_async_dir: '/tmp/.ansible_async'
4549
...

roles/project_update/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
poll: 0
2828
register: __project_update_job_async
2929
changed_when: not __project_update_job_async.changed
30+
vars:
31+
ansible_async_dir: '/tmp/.ansible_async'
3032

3133
- name: "Configure Controller Projects | Wait for finish the projects creation"
3234
async_status:
@@ -40,4 +42,6 @@
4042
loop_var: __project_update_job_async_results_item
4143
when: __project_update_job_async_results_item.ansible_job_id is defined
4244
no_log: "{{ controller_configuration_project_update_secure_logging }}"
45+
vars:
46+
ansible_async_dir: '/tmp/.ansible_async'
4347
...

roles/projects/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@
4343
poll: 0
4444
register: __projects_job_async
4545
changed_when: not __projects_job_async.changed
46+
vars:
47+
ansible_async_dir: '/tmp/.ansible_async'
4648

4749
- name: "Configure Controller Projects | Wait for finish the projects creation"
4850
async_status:
@@ -56,4 +58,6 @@
5658
loop_var: __projects_job_async_results_item
5759
when: __projects_job_async_results_item.ansible_job_id is defined
5860
no_log: "{{ controller_configuration_projects_secure_logging }}"
61+
vars:
62+
ansible_async_dir: '/tmp/.ansible_async'
5963
...

roles/roles/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
poll: 0
3737
register: __controller_role_job_async
3838
changed_when: not __controller_role_job_async.changed
39+
vars:
40+
ansible_async_dir: '/tmp/.ansible_async'
3941

4042
- name: "Configure Roles | Wait for finish the Roles creation"
4143
async_status:
@@ -49,4 +51,6 @@
4951
loop_var: __controller_role_job_async_results_item
5052
when: __controller_role_job_async_results_item.ansible_job_id is defined
5153
no_log: "{{ controller_configuration_role_secure_logging }}"
54+
vars:
55+
ansible_async_dir: '/tmp/.ansible_async'
5256
...

roles/schedules/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
poll: 0
3434
register: __controller_schedule_job_async
3535
changed_when: not __controller_schedule_job_async.changed
36+
vars:
37+
ansible_async_dir: '/tmp/.ansible_async'
3638

3739
- name: "Configure Schedules | Wait for finish the Schedules creation"
3840
async_status:
@@ -46,4 +48,6 @@
4648
loop_var: __controller_schedule_job_async_results_item
4749
when: __controller_schedule_job_async_results_item.ansible_job_id is defined
4850
no_log: "{{ controller_configuration_schedules_secure_logging }}"
51+
vars:
52+
ansible_async_dir: '/tmp/.ansible_async'
4953
...

roles/settings/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
poll: 0
2323
register: __controller_setting_job_async
2424
changed_when: not __controller_setting_job_async.changed
25+
vars:
26+
ansible_async_dir: '/tmp/.ansible_async'
2527

2628
- name: "Configure Settings | Wait for finish the Settings creation"
2729
async_status:
@@ -35,4 +37,6 @@
3537
loop_var: __controller_setting_job_async_results_item
3638
when: __controller_setting_job_async_results_item.ansible_job_id is defined
3739
no_log: "{{ controller_configuration_settings_secure_logging }}"
40+
vars:
41+
ansible_async_dir: '/tmp/.ansible_async'
3842
...

roles/teams/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
poll: 0
2323
register: __controller_team_job_async
2424
changed_when: not __controller_team_job_async.changed
25+
vars:
26+
ansible_async_dir: '/tmp/.ansible_async'
2527

2628
- name: "Configure Teams | Wait for finish the Teams creation"
2729
async_status:
@@ -35,4 +37,6 @@
3537
loop_var: __controller_team_job_async_results_item
3638
when: __controller_team_job_async_results_item.ansible_job_id is defined
3739
no_log: "{{ controller_configuration_teams_secure_logging }}"
40+
vars:
41+
ansible_async_dir: '/tmp/.ansible_async'
3842
...

roles/users/tasks/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
poll: 0
2929
register: __controller_user_accounts_job_async
3030
changed_when: not __controller_user_accounts_job_async.changed
31+
vars:
32+
ansible_async_dir: '/tmp/.ansible_async'
3133

3234
- name: "Configure Users | Wait for finish the Users creation"
3335
async_status:
@@ -41,4 +43,6 @@
4143
loop_var: __controller_user_accounts_job_async_results_item
4244
when: __controller_user_accounts_job_async_results_item.ansible_job_id is defined
4345
no_log: "{{ controller_configuration_users_secure_logging }}"
46+
vars:
47+
ansible_async_dir: '/tmp/.ansible_async'
4448
...

0 commit comments

Comments
 (0)