Skip to content

Commit 1e965aa

Browse files
fix: dispatch role wildcard vars (#1215)
* fix: dispatch role wildcard vars - add missing tasks and fix naming - Fix naming mismatch: rename http_ports to gateway_http_ports in wildcard vars task - Add missing wildcard variable tasks for gateway_role_definitions and gateway_role_team_assignments - Ensure tasks are ordered to match the sequence in defaults/main.yml - All variables defined in dispatch defaults now have corresponding wildcard handling * fixing link --------- Co-authored-by: Sean Sullivan <[email protected]>
1 parent ac73353 commit 1e965aa

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
bugfixes:
3+
- Fix missing wildcard variable tasks for gateway_http_portsgateway_role_definitions, and gateway_role_team_assignments to ensure all variables defined in defaults are properly handled
4+
...

roles/dispatch/tasks/include_wildcard_vars.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
aap_applications: "{{ (aap_applications | default([])) + lookup('ansible.builtin.vars', item) }}"
2525
loop: "{{ [] if (lookup('ansible.builtin.varnames', 'aap_applications.*')) is not string else (lookup('ansible.builtin.varnames', 'aap_applications.*') | split(',')) }}"
2626

27+
- name: include_wildcard_vars | Set fact for gateway_http_ports
28+
ansible.builtin.set_fact:
29+
gateway_http_ports: "{{ (gateway_http_ports | default([])) + lookup('ansible.builtin.vars', item) }}"
30+
loop: "{{ [] if (lookup('ansible.builtin.varnames', 'gateway_http_ports.*')) is not string else (lookup('ansible.builtin.varnames', 'gateway_http_ports.*') | split(',')) }}"
31+
2732
- name: include_wildcard_vars | Set fact for gateway_service_clusters
2833
ansible.builtin.set_fact:
2934
gateway_service_clusters: "{{ (gateway_service_clusters | default([])) + lookup('ansible.builtin.vars', item) }}"
@@ -54,6 +59,16 @@
5459
aap_user_accounts: "{{ (aap_user_accounts | default([])) + lookup('ansible.builtin.vars', item) }}"
5560
loop: "{{ [] if (lookup('ansible.builtin.varnames', 'aap_user_accounts.*')) is not string else (lookup('ansible.builtin.varnames', 'aap_user_accounts.*') | split(',')) }}"
5661

62+
- name: include_wildcard_vars | Set fact for gateway_role_definitions
63+
ansible.builtin.set_fact:
64+
gateway_role_definitions: "{{ (gateway_role_definitions | default([])) + lookup('ansible.builtin.vars', item) }}"
65+
loop: "{{ [] if (lookup('ansible.builtin.varnames', 'gateway_role_definitions.*')) is not string else (lookup('ansible.builtin.varnames', 'gateway_role_definitions.*') | split(',')) }}"
66+
67+
- name: include_wildcard_vars | Set fact for gateway_role_team_assignments
68+
ansible.builtin.set_fact:
69+
gateway_role_team_assignments: "{{ (gateway_role_team_assignments | default([])) + lookup('ansible.builtin.vars', item) }}"
70+
loop: "{{ [] if (lookup('ansible.builtin.varnames', 'gateway_role_team_assignments.*')) is not string else (lookup('ansible.builtin.varnames', 'gateway_role_team_assignments.*') | split(',')) }}"
71+
5772
- name: include_wildcard_vars | Set fact for gateway_role_user_assignments
5873
ansible.builtin.set_fact:
5974
gateway_role_user_assignments: "{{ (gateway_role_user_assignments | default([])) + lookup('ansible.builtin.vars', item) }}"
@@ -64,11 +79,6 @@
6479
gateway_routes: "{{ (gateway_routes | default([])) + lookup('ansible.builtin.vars', item) }}"
6580
loop: "{{ [] if (lookup('ansible.builtin.varnames', 'gateway_routes.*')) is not string else (lookup('ansible.builtin.varnames', 'gateway_routes.*') | split(',')) }}"
6681

67-
- name: include_wildcard_vars | Set fact for http_ports
68-
ansible.builtin.set_fact:
69-
http_ports: "{{ (http_ports | default([])) + lookup('ansible.builtin.vars', item) }}"
70-
loop: "{{ [] if (lookup('ansible.builtin.varnames', 'http_ports.*')) is not string else (lookup('ansible.builtin.varnames', 'http_ports.*') | split(',')) }}"
71-
7282
- name: include_wildcard_vars | Set fact for hub_namespaces
7383
ansible.builtin.set_fact:
7484
hub_namespaces: "{{ (hub_namespaces | default([])) + lookup('ansible.builtin.vars', item) }}"

roles/eda_credential_types/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ The role will strip the double space between the curly bracket in order to provi
8888

8989
### Input and Injector Schema
9090

91-
The following details the data format to use for inputs and injectors. These can be in either YAML or JSON For the most up to date information and more details see [Custom Credential Types - Ansible Controller Documentation](https://docs.ansible.com/automation-controller/latest/html/userguide/credential_plugins.html)
91+
The following details the data format to use for inputs and injectors. These can be in either YAML or JSON For the most up to date information and more details see [Custom Credential Types - Ansible Controller Documentation](https://docs.redhat.com/en/documentation/red_hat_ansible_automation_platform/2.6/html/configuring_automation_execution/assembly-controller-secret-management)
9292

9393
#### Input Schema
9494

0 commit comments

Comments
 (0)