Skip to content

Commit 36534ed

Browse files
committed
modified: roles/controller_credential_input_sources/tasks/main.yml
modified: roles/controller_credential_types/tasks/main.yml modified: roles/controller_credentials/tasks/main.yml modified: roles/controller_execution_environments/tasks/main.yml modified: roles/controller_host_groups/tasks/main.yml modified: roles/controller_hosts/tasks/main.yml modified: roles/controller_instance_groups/tasks/main.yml modified: roles/controller_instances/tasks/main.yml modified: roles/controller_inventories/tasks/main.yml modified: roles/controller_inventory_source_update/tasks/main.yml modified: roles/controller_inventory_sources/tasks/main.yml modified: roles/controller_job_templates/tasks/main.yml modified: roles/controller_labels/tasks/main.yml modified: roles/controller_notification_templates/tasks/main.yml modified: roles/controller_organizations/tasks/main.yml modified: roles/controller_projects/tasks/main.yml modified: roles/controller_roles/tasks/main.yml modified: roles/controller_schedules/tasks/main.yml modified: roles/controller_users/tasks/main.yml modified: roles/controller_workflow_job_templates/tasks/add_workflows_schema.yml modified: roles/controller_workflow_job_templates/tasks/main.yml modified: roles/dispatch/defaults/main.yml modified: roles/eda_controller_tokens/tasks/main.yml modified: roles/eda_credential_types/tasks/main.yml modified: roles/eda_credentials/tasks/main.yml modified: roles/eda_event_streams/tasks/main.yml modified: roles/gateway_organizations/tasks/main.yml modified: roles/gateway_role_user_assignments/tasks/main.yml modified: roles/gateway_routes/tasks/main.yml modified: roles/gateway_service_keys/tasks/main.yml modified: roles/gateway_service_nodes/tasks/main.yml modified: roles/gateway_services/tasks/main.yml modified: roles/gateway_teams/tasks/main.yml modified: roles/gateway_users/tasks/main.yml modified: roles/hub_collection/tasks/main.yml modified: roles/hub_ee_registry/tasks/main.yml modified: roles/hub_ee_registry_index/tasks/main.yml modified: roles/hub_ee_registry_sync/tasks/main.yml modified: roles/hub_ee_repository/tasks/main.yml modified: roles/hub_ee_repository_sync/tasks/main.yml modified: roles/hub_group_roles/tasks/main.yml modified: roles/hub_namespace/tasks/main.yml modified: tests/configure_controller.yml modified: tests/configure_controller_export_model.yml
1 parent e0c12af commit 36534ed

File tree

44 files changed

+66
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+66
-132
lines changed

roles/controller_credential_input_sources/tasks/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,10 @@
4444
loop: "{{ __credential_input_sources_job_async.results }}"
4545
loop_control:
4646
loop_var: __credential_input_sources_job_async_results_item
47-
label: "{{ __operation.verb }} Controller Credential Input Source for Credential {{ __credential_input_sources_job_async_results_item.__cred_input_src_item.target_credential
48-
}}"
47+
label: "{{ __operation.verb }} Controller Credential Input Source for Credential {{ __credential_input_sources_job_async_results_item.__cred_input_src_item.target_credential }}"
4948
when: not ansible_check_mode and __credential_input_sources_job_async_results_item.ansible_job_id is defined
5049
no_log: "{{ controller_configuration_credential_input_sources_secure_logging }}"
5150
vars:
52-
__operation: "{{ operation_translate[__credential_input_sources_job_async_results_item.__cred_input_src_item.state | default(platform_state) | default('present')]
53-
}}"
51+
__operation: "{{ operation_translate[__credential_input_sources_job_async_results_item.__cred_input_src_item.state | default(platform_state) | default('present')] }}"
5452
ansible_async_dir: "{{ aap_configuration_async_dir }}"
5553
...

roles/controller_credential_types/tasks/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,10 @@
4646
loop: "{{ __credentialtypes_job_async.results }}"
4747
loop_control:
4848
loop_var: __credentialtypes_job_async_result_item
49-
label: "{{ __operation.verb }} Controller Credential Type {{ __credentialtypes_job_async_result_item }} | Wait for finish the credential type {{ __operation.action
50-
}}"
49+
label: "{{ __operation.verb }} Controller Credential Type {{ __credentialtypes_job_async_result_item }} | Wait for finish the credential type {{ __operation.action }}"
5150
when: not ansible_check_mode and __credentialtypes_job_async_result_item.ansible_job_id is defined
5251
no_log: "{{ controller_configuration_credential_types_secure_logging }}"
5352
vars:
54-
__operation: "{{ operation_translate[__credentialtypes_job_async_result_item.__controller_credential_type_item.state | default(platform_state) | default('present')]
55-
}}"
53+
__operation: "{{ operation_translate[__credentialtypes_job_async_result_item.__controller_credential_type_item.state | default(platform_state) | default('present')] }}"
5654
ansible_async_dir: "{{ aap_configuration_async_dir }}"
5755
...

roles/controller_credentials/tasks/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
loop: "{{ __credentials_job_async.results }}"
5050
loop_control:
5151
loop_var: __credentials_job_async_results_item
52-
label: "{{ __operation.verb }} Credential {{ __credentials_job_async_results_item.__controller_credentials_item.name }} | Wait for finish the credential {{ __operation.action
53-
}}"
52+
label: "{{ __operation.verb }} Credential {{ __credentials_job_async_results_item.__controller_credentials_item.name }} | Wait for finish the credential {{ __operation.action }}"
5453
when: not ansible_check_mode and __credentials_job_async_results_item.ansible_job_id is defined
5554
no_log: "{{ controller_configuration_credentials_secure_logging }}"
5655
vars:

roles/controller_execution_environments/tasks/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
execution_environment:
55
name: "{{ __execution_environments_item.name | mandatory }}"
66
new_name: "{{ __execution_environments_item.new_name | default(omit, true) }}"
7-
description: "{{ __execution_environments_item.description | default(('' if controller_configuration_execution_environments_enforce_defaults else omit), true)
8-
}}"
7+
description: "{{ __execution_environments_item.description | default(('' if controller_configuration_execution_environments_enforce_defaults else omit), true) }}"
98
image: "{{ __execution_environments_item.image | mandatory }}"
109
organization: "{{ __execution_environments_item.organization.name | default(__execution_environments_item.organization | default(('' if controller_configuration_execution_environments_enforce_defaults
1110
else omit), true)) }}"
@@ -55,7 +54,6 @@
5554
when: not ansible_check_mode and __execution_environments_job_async_results_item.ansible_job_id is defined
5655
no_log: "{{ controller_configuration_execution_environments_secure_logging }}"
5756
vars:
58-
__operation: "{{ operation_translate[__execution_environments_job_async_results_item.__execution_environments_item.state | default(platform_state) | default('present')]
59-
}}"
57+
__operation: "{{ operation_translate[__execution_environments_job_async_results_item.__execution_environments_item.state | default(platform_state) | default('present')] }}"
6058
ansible_async_dir: "{{ aap_configuration_async_dir }}"
6159
...

roles/controller_host_groups/tasks/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
'{_~~remove~~_{') | regex_replace('_~~remove~~_', '') }}"
1212
hosts: "{{ __controller_groups_item.hosts | default(([] if controller_configuration_groups_enforce_defaults else omit), true) }}"
1313
children: "{{ __controller_groups_item.children | default(([] if controller_configuration_groups_enforce_defaults else omit), true) }}"
14-
preserve_existing_hosts: "{{ __controller_groups_item.preserve_existing_hosts | default((false if controller_configuration_groups_enforce_defaults else omit))
15-
}}"
14+
preserve_existing_hosts: "{{ __controller_groups_item.preserve_existing_hosts | default((false if controller_configuration_groups_enforce_defaults else omit)) }}"
1615
preserve_existing_children: "{{ __controller_groups_item.preserve_existing_children | default((false if controller_configuration_groups_enforce_defaults else
1716
omit)) }}"
1817
state: "{{ __controller_groups_item.state | default(platform_state | default('present')) }}"
@@ -53,8 +52,7 @@
5352
loop: "{{ __group_job_async.results }}"
5453
loop_control:
5554
loop_var: __group_job_async_results_item
56-
label: "{{ __operation.verb }} Controller Group {{ __group_job_async_results_item.__controller_groups_item.name }} | Wait for finish the Controller Group {{ __operation.action
57-
}}"
55+
label: "{{ __operation.verb }} Controller Group {{ __group_job_async_results_item.__controller_groups_item.name }} | Wait for finish the Controller Group {{ __operation.action }}"
5856
when: not ansible_check_mode and __group_job_async_results_item.ansible_job_id is defined
5957
no_log: "{{ controller_configuration_group_secure_logging }}"
6058
vars:

roles/controller_hosts/tasks/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@
4646
loop: "{{ __host_job_async.results }}"
4747
loop_control:
4848
loop_var: __host_job_async_results_item
49-
label: "{{ __operation.verb }} Controller Host {{ __host_job_async_results_item.__controller_host_item.name }} | Wait for finish the Hosts {{ __operation.action
50-
}}"
49+
label: "{{ __operation.verb }} Controller Host {{ __host_job_async_results_item.__controller_host_item.name }} | Wait for finish the Hosts {{ __operation.action }}"
5150
when: not ansible_check_mode and __host_job_async_results_item.ansible_job_id is defined
5251
no_log: "{{ controller_configuration_hosts_secure_logging }}"
5352
vars:

roles/controller_instance_groups/tasks/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
when: not ansible_check_mode and __instance_groups_job_async_results_item.ansible_job_id is defined
6464
no_log: "{{ controller_configuration_instance_groups_secure_logging }}"
6565
vars:
66-
__operation: "{{ operation_translate[__instance_groups_job_async_results_item.__controller_instance_group_item.state | default(platform_state) | default('present')]
67-
}}"
66+
__operation: "{{ operation_translate[__instance_groups_job_async_results_item.__controller_instance_group_item.state | default(platform_state) | default('present')] }}"
6867
ansible_async_dir: "{{ aap_configuration_async_dir }}"
6968
...

roles/controller_instances/tasks/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
- name: Add Controller Instance
44
instance:
55
hostname: "{{ __controller_instance_item.hostname | mandatory }}"
6-
capacity_adjustment: "{{ __controller_instance_item.capacity_adjustment | default((1.0 if controller_configuration_instances_enforce_defaults else omit), true)
7-
}}"
6+
capacity_adjustment: "{{ __controller_instance_item.capacity_adjustment | default((1.0 if controller_configuration_instances_enforce_defaults else omit), true) }}"
87
enabled: "{{ __controller_instance_item.enabled | default((true if controller_configuration_instances_enforce_defaults else omit), true) }}"
98
managed_by_policy: "{{ __controller_instance_item.managed_by_policy | default((true if controller_configuration_instances_enforce_defaults else omit), true) }}"
109
node_type: "{{ __controller_instance_item.node_type | default(omit, true) }}"

roles/controller_inventories/tasks/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
description: "{{ __controller_inventory_item.description | default(('' if controller_configuration_inventories_enforce_defaults else omit), true) }}"
88
organization: "{{ __controller_inventory_item.organization.name | default(__controller_inventory_item.organization) | mandatory }}"
99
instance_groups: "{{ __controller_inventory_item.instance_groups | default(([] if controller_configuration_inventories_enforce_defaults else omit), true) }}"
10-
input_inventories: "{{ __controller_inventory_item.input_inventories | default(([] if controller_configuration_inventories_enforce_defaults else omit), true)
11-
}}"
10+
input_inventories: "{{ __controller_inventory_item.input_inventories | default(([] if controller_configuration_inventories_enforce_defaults else omit), true) }}"
1211
variables: "{{ __controller_inventory_item.variables | default(({} if controller_configuration_inventories_enforce_defaults else omit), true) | regex_replace('{\
1312
\ {', '{_~~remove~~_{') | regex_replace('_~~remove~~_', '') }}"
1413
kind: "{{ __controller_inventory_item.kind | default(('' if controller_configuration_inventories_enforce_defaults else omit), true) }}"

roles/controller_inventory_source_update/tasks/main.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
loop: "{{ inventory_sources if inventory_sources is defined else controller_inventory_sources }}"
2020
loop_control:
2121
loop_var: __inventory_source_update_item
22-
label: "{{ (__inventory_source_update_item.organization | default('<no_org>')) }}/{{ __inventory_source_update_item.inventory }}/{{ __inventory_source_update_item.name
23-
}}"
22+
label: "{{ (__inventory_source_update_item.organization | default('<no_org>')) }}/{{ __inventory_source_update_item.inventory }}/{{ __inventory_source_update_item.name }}"
2423
pause: "{{ controller_configuration_inventory_source_update_loop_delay }}"
2524
no_log: "{{ controller_configuration_inventory_source_update_secure_logging }}"
2625
when:

0 commit comments

Comments
 (0)