Skip to content

Commit 6bdecac

Browse files
More updates, more testing (redhat-cop#951)
* update typos tests * move workflows temporarily * more testing and tweaking
1 parent bf434d8 commit 6bdecac

File tree

40 files changed

+434
-396
lines changed

40 files changed

+434
-396
lines changed

roles/dispatch/defaults/main.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
gateway_configuration_dispatcher_roles:
33
- role: gateway_authenticators
4-
var: authenticators_list
4+
var: gateway_authenticators
55
tags: authenticators
66
- role: gateway_authenticator_maps
7-
var: authenticator_maps_list
7+
var: gateway_authenticator_maps
88
tags: authenticator_maps
99
- role: gateway_settings
1010
var: gateway_settings
@@ -19,22 +19,22 @@ gateway_configuration_dispatcher_roles:
1919
var: aap_organizations
2020
tags: organizations
2121
- role: gateway_service_clusters
22-
var: gateway_service_nodes
22+
var: gateway_service_clusters
2323
tags: service_clusters
2424
- role: gateway_service_keys
25-
var: service_keys_list
25+
var: gateway_service_keys
2626
tags: service_keys
2727
- role: gateway_service_nodes
28-
var: service_nodes_list
28+
var: gateway_service_nodes
2929
tags: service_nodes
3030
- role: gateway_services
31-
var: services_list
31+
var: gateway_services
3232
tags: services
3333
- role: gateway_role_user_assignments
34-
var: role_user_assignments_list
34+
var: gateway_role_user_assignments
3535
tags: role_user_assignments
3636
- role: gateway_routes
37-
var: routes_list
37+
var: gateway_routes
3838
tags: routes
3939
- role: gateway_teams
4040
var: aap_teams
@@ -62,9 +62,12 @@ ah_configuration_dispatcher_roles:
6262
- role: hub_ee_image
6363
var: ah_ee_images
6464
tags: images
65+
- role: hub_ee_registry
66+
var: ah_ee_registries
67+
tags: registry
6568
- role: hub_ee_registry_index
6669
var: ah_ee_registries
67-
tags: indices
70+
tags: ee_indices
6871
- role: hub_ee_registry_sync
6972
var: ah_ee_registries
7073
tags: regsync
@@ -163,9 +166,9 @@ eda_configuration_dispatcher_roles:
163166
- role: eda_projects
164167
var: eda_projects
165168
tags: project
166-
# - role: eda_project_sync
167-
# var: eda_projects
168-
# tags: project_sync
169+
- role: eda_project_sync
170+
var: eda_projects
171+
tags: project_sync
169172
- role: eda_decision_environments
170173
var: eda_decision_environments
171174
tags: decision_environment

roles/gateway_applications/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ gateway_applications_secure_logging: "{{ aap_configuration_secure_logging | defa
55
gateway_applications_async_retries: "{{ aap_configuration_async_retries | default(30) }}"
66
gateway_applications_async_delay: "{{ aap_configuration_async_delay | default(1) }}"
77
gateway_applications_enforce_defaults: "{{ aap_configuration_enforce_defaults | default(false) }}"
8+
aap_applications_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}"
89
aap_configuration_async_dir: null
910
...

roles/gateway_applications/tasks/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
loop_control:
2828
loop_var: __gateway_application_item
2929
label: "{{ __operation.verb }} AAP Platform Applications {{ __gateway_application_item.name }}"
30-
pause: "{{ gateway_applications_loop_delay }}"
30+
pause: "{{ aap_applications_loop_delay }}"
3131
no_log: "{{ gateway_applications_secure_logging }}"
3232
async: "{{ ansible_check_mode | ternary(0, 1000) }}"
3333
poll: 0
@@ -47,9 +47,9 @@
4747
loop: "{{ __gateway_applications_job_async.results }}"
4848
loop_control:
4949
loop_var: __gateway_applications_job_async_results_item
50-
label: "{{ __operation.verb }} AAP Platform Applications {{ __gateway_applications_job_async_result.__gateway_application_item.name }} | Wait for finish the Applications {{ __operation.action }}"
50+
label: "{{ __operation.verb }} AAP Platform Applications {{ __gateway_applications_job_async_results_item.__gateway_application_item.name }} | Wait for finish the Applications {{ __operation.action }}"
5151
when: __gateway_applications_job_async_results_item.ansible_job_id is defined
52-
no_log: "{{ applications_secure_logging }}"
52+
no_log: "{{ gateway_applications_secure_logging }}"
5353
vars:
5454
__operation: "{{ operation_translate[__gateway_applications_job_async_results_item.state | default(platform_state) | default('present')] }}"
5555
ansible_async_dir: "{{ aap_configuration_async_dir }}"

roles/gateway_authenticator_maps/defaults/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ gateway_authenticator_maps: []
1313
gateway_authenticator_maps_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}"
1414
gateway_authenticator_maps_async_retries: "{{ aap_configuration_async_retries | default(30) }}"
1515
gateway_authenticator_maps_async_delay: "{{ aap_configuration_async_delay | default(1) }}"
16+
gateway_authenticator_maps_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}"
17+
aap_configuration_async_dir: null
1618
...

roles/gateway_authenticator_maps/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
loop: "{{ __gateway_authenticator_maps_job_async.results }}"
4646
loop_control:
4747
loop_var: __gateway_authenticator_maps_job_async_results_item
48-
label: "{{ __operation.verb }} AAP Platform Authenticator Maps {{ __gateway_authenticator_maps_job_async_result.__gateway_authenticator_maps_item.name }} | Wait for finish the Authenticator Map {{ __operation.action }}"
48+
label: "{{ __operation.verb }} AAP Platform Authenticator Maps {{ __gateway_authenticator_maps_job_async_results_item.__gateway_authenticator_maps_item.name }} | Wait for finish the Authenticator Map {{ __operation.action }}"
4949
when: __gateway_authenticator_maps_job_async_results_item.ansible_job_id is defined
5050
no_log: "{{ gateway_authenticator_maps_secure_logging }}"
5151
vars:

roles/gateway_authenticators/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
loop: "{{ __gateway_authenticators_job_async.results }}"
4444
loop_control:
4545
loop_var: __gateway_authenticators_job_async_results_item
46-
label: "{{ __operation.verb }} AAP Platform Authenticators {{ __gateway_authenticators_job_async_result.__gateway_authenticators_item.name }} | Wait for finish the Authenticators {{ __operation.action }}"
46+
label: "{{ __operation.verb }} AAP Platform Authenticators {{ __gateway_authenticators_job_async_results_item.__gateway_authenticators_item.name }} | Wait for finish the Authenticators {{ __operation.action }}"
4747
when: __gateway_authenticators_job_async_results_item.ansible_job_id is defined
4848
no_log: "{{gateway_authenticators_secure_logging }}"
4949
vars:

roles/gateway_organizations/meta/argument_specs.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,22 @@ argument_specs:
88
type: list
99
required: true
1010
elements: dict
11-
options:
12-
name:
13-
required: true
14-
type: str
15-
description: Name of the resource
16-
new_name:
17-
type: str
18-
description: Setting this option will change the existing name (looked up via the name field)
19-
description:
20-
type: str
21-
description: Description of the organization
22-
state:
23-
default: "{{ platform_state | default('present') }}"
24-
required: false
25-
type: str
26-
description: Desired state of the resource.
11+
# options:
12+
# name:
13+
# required: true
14+
# type: str
15+
# description: Name of the resource
16+
# new_name:
17+
# type: str
18+
# description: Setting this option will change the existing name (looked up via the name field)
19+
# description:
20+
# type: str
21+
# description: Description of the organization
22+
# state:
23+
# default: "{{ platform_state | default('present') }}"
24+
# required: false
25+
# type: str
26+
# description: Desired state of the resource.
2727

2828
# Async variables
2929
gateway_organizations_async_retries:

roles/gateway_organizations/tasks/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
- name: Organizations | Configuration # noqa fqcn[action-core]
33
ansible.platform.organization:
4-
name: "{{ __gateway_organizations_item.name | mandatory }}"
5-
new_name: "{{ __gateway_organizations_item.new_name | default(omit) }}"
6-
description: "{{ __gateway_organizations_item.description | default(omit) }}"
7-
state: "{{ __gateway_organizations_item.state | default(platform_state | default(omit, true)) }}"
4+
name: "{{ __gateway_organization_item.name | mandatory }}"
5+
new_name: "{{ __gateway_organization_item.new_name | default(omit) }}"
6+
description: "{{ __gateway_organization_item.description | default(omit) }}"
7+
state: "{{ __gateway_organization_item.state | default(platform_state | default(omit, true)) }}"
88

99
# Role Standard Options
1010
gateway_hostname: "{{ aap_hostname | default(omit, true) }}"
@@ -15,16 +15,16 @@
1515
gateway_validate_certs: "{{ aap_validate_certs | default(omit) }}"
1616
loop: "{{ aap_organizations }}"
1717
loop_control:
18-
loop_var: __gateway_organizations_item
19-
label: "{{ __operation.verb }} AAP Platform Organizations {{ __gateway_organizations_item.name }}"
18+
loop_var: __gateway_organization_item
19+
label: "{{ __operation.verb }} AAP Platform Organizations {{ __gateway_organization_item.name }}"
2020
pause: "{{ gateway_organizations_loop_delay }}"
2121
no_log: "{{ gateway_organizations_secure_logging }}"
2222
async: 1000
2323
poll: 0
2424
register: __gateway_organizations_job_async
2525
changed_when: not __gateway_organizations_job_async.changed
2626
vars:
27-
__operation: "{{ operation_translate[__gateway_organizations_item.state | default(platform_state) | default('present')] }}"
27+
__operation: "{{ operation_translate[__gateway_organization_item.state | default(platform_state) | default('present')] }}"
2828
ansible_async_dir: "{{ aap_configuration_async_dir }}"
2929

3030
- name: Organizations | Wait for finish the configuration
@@ -37,7 +37,7 @@
3737
loop: "{{ __gateway_organizations_job_async.results }}"
3838
loop_control:
3939
loop_var: __gateway_organizations_job_async_results_item
40-
label: "{{ __operation.verb }} AAP Platform Organizations {{ __gateway_organizations_job_async_result.__gateway_organizations_item.name }} | Wait for finish the Organizations {{ __operation.action }}"
40+
label: "{{ __operation.verb }} AAP Platform Organizations {{ __gateway_organizations_job_async_result.__gateway_organizations_job_async_results_item.__gateway_organization_item.name }} | Wait for finish the Organizations {{ __operation.action }}"
4141
when: __gateway_organizations_job_async_results_item.ansible_job_id is defined
4242
no_log: "{{ gateway_organizations_secure_logging }}"
4343
vars:

roles/gateway_routes/defaults/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# These are the default variables specific to the license role
1010

1111
# a list of dictionaries describing the service nodes
12-
gateway_gateway_routes: []
12+
gateway_routes: []
1313
gateway_routes_secure_logging: "{{ aap_configuration_secure_logging | default('false') }}"
1414
gateway_routes_async_retries: "{{ aap_configuration_async_retries | default(30) }}"
1515
gateway_routes_async_delay: "{{ aap_configuration_async_delay | default(1) }}"

roles/gateway_service_clusters/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
# a list of dictionaries describing the service clusters
1212
gateway_service_clusters: []
13+
gateway_service_clusters_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}"
1314
gateway_service_clusters_async_retries: "{{ aap_configuration_async_retries | default(30) }}"
1415
gateway_service_clusters_async_delay: "{{ aap_configuration_async_delay | default(1) }}"
1516
gateway_service_clusters_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}"

0 commit comments

Comments
 (0)