Skip to content

Commit

Permalink
Deduplicate role task in roles role (#662)
Browse files Browse the repository at this point in the history 
* Deduplicate role task in roles role

* Fix mistakenly changed async dir and fix readme mistake
  • Loading branch information
@Tompage1994
Tompage1994 authored Aug 2, 2023
1 parent 4f273f4 commit fe3f79a
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 68 deletions.
2 changes: 1 addition & 1 deletion roles/roles/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ Note that the `roles` option takes precedence over the `role` option and simply
{
"team": "My Team",
"organization": "Default",
"role": [
"roles": [
"execute",
"read"
]
Expand Down
90 changes: 23 additions & 67 deletions roles/roles/tasks/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1,28 @@
---
- name: Create Roles Based Access Entry on Controller
role:
user: "{{ __controller_role_item.0.user | default(omit, true) }}"
users: "{{ __controller_role_item.0.users | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
team: "{{ __controller_role_item.0.team | default(omit, true) }}"
teams: "{{ __controller_role_item.0.teams | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
role: "{{ __controller_role_item.1 | mandatory }}"
target_team: "{{ __controller_role_item.0.target_team | default(omit, true) }}"
target_teams: "{{ __controller_role_item.0.target_teams | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
inventory: "{{ __controller_role_item.0.inventory | default(omit, true) }}"
inventories: "{{ __controller_role_item.0.inventories | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
job_template: "{{ __controller_role_item.0.job_template | default(omit, true) }}"
job_templates: "{{ __controller_role_item.0.job_templates | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
workflow: "{{ __controller_role_item.0.workflow | default(omit, true) }}"
workflows: "{{ __controller_role_item.0.workflows | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
credential: "{{ __controller_role_item.0.credential | default(omit, true) }}"
credentials: "{{ __controller_role_item.0.credentials | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
organization: "{{ __controller_role_item.0.organization | default(omit, true) }}"
organizations: "{{ __controller_role_item.0.organizations | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
lookup_organization: "{{ __controller_role_item.0.lookup_organization | default(omit, true) }}"
project: "{{ __controller_role_item.0.project | default(omit, true) }}"
projects: "{{ __controller_role_item.0.projects | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
instance_groups: "{{ __controller_role_item.0.instance_groups | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
state: "{{ __controller_role_item.0.state | default(controller_state | default('present')) }}"

# Role Standard Options
controller_username: "{{ controller_username | default(omit, true) }}"
controller_password: "{{ controller_password | default(omit, true) }}"
controller_oauthtoken: "{{ controller_oauthtoken | default(omit, true) }}"
controller_host: "{{ controller_hostname | default(omit, true) }}"
controller_config_file: "{{ controller_config_file | default(omit, true) }}"
validate_certs: "{{ controller_validate_certs | default(omit) }}"
loop: "{{ controller_roles | subelements('roles', skip_missing=true) }}"
loop_control:
loop_var: __controller_role_item
no_log: "{{ controller_configuration_role_secure_logging }}"
async: 1000
poll: 0
register: __controller_role_job_async
changed_when: not __controller_role_job_async.changed
vars:
ansible_async_dir: '/tmp/.ansible_async'

- name: Create Role Based Access Entry on Controller
role:
user: "{{ __controller_role_item.user | default(omit, true) }}"
users: "{{ __controller_role_item.users | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
team: "{{ __controller_role_item.team | default(omit, true) }}"
teams: "{{ __controller_role_item.teams | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
role: "{{ __controller_role_item.role | mandatory }}"
target_team: "{{ __controller_role_item.target_team | default(omit, true) }}"
target_teams: "{{ __controller_role_item.target_teams | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
inventory: "{{ __controller_role_item.inventory | default(omit, true) }}"
inventories: "{{ __controller_role_item.inventories | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
job_template: "{{ __controller_role_item.job_template | default(omit, true) }}"
job_templates: "{{ __controller_role_item.job_templates | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
workflow: "{{ __controller_role_item.workflow | default(omit, true) }}"
workflows: "{{ __controller_role_item.workflows | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
credential: "{{ __controller_role_item.credential | default(omit, true) }}"
credentials: "{{ __controller_role_item.credentials | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
organization: "{{ __controller_role_item.organization | default(omit, true) }}"
organizations: "{{ __controller_role_item.organizations | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
lookup_organization: "{{ __controller_role_item.lookup_organization | default(omit, true) }}"
project: "{{ __controller_role_item.project | default(omit, true) }}"
projects: "{{ __controller_role_item.projects | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
instance_groups: "{{ __controller_role_item.instance_groups | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
state: "{{ __controller_role_item.state | default(controller_state | default('present')) }}"
user: "{{ __controller_role_item.0.user | default(__controller_role_item.user) | default(omit, true) }}"
users: "{{ __controller_role_item.0.users | default(__controller_role_item.users) | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
team: "{{ __controller_role_item.0.team | default(__controller_role_item.team) | default(omit, true) }}"
teams: "{{ __controller_role_item.0.teams | default(__controller_role_item.teams) | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
role: "{{ __controller_role_item.1 | default(__controller_role_item.role) | mandatory }}"
target_team: "{{ __controller_role_item.0.target_team | default(__controller_role_item.target_team) | default(omit, true) }}"
target_teams: "{{ __controller_role_item.0.target_teams | default(__controller_role_item.target_teams) | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
inventory: "{{ __controller_role_item.0.inventory | default(__controller_role_item.inventory) | default(omit, true) }}"
inventories: "{{ __controller_role_item.0.inventories | default(__controller_role_item.inventories) | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
job_template: "{{ __controller_role_item.0.job_template | default(__controller_role_item.job_template) | default(omit, true) }}"
job_templates: "{{ __controller_role_item.0.job_templates | default(__controller_role_item.job_templates) | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
workflow: "{{ __controller_role_item.0.workflow | default(__controller_role_item.workflow) | default(omit, true) }}"
workflows: "{{ __controller_role_item.0.workflows | default(__controller_role_item.workflows) | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
credential: "{{ __controller_role_item.0.credential | default(__controller_role_item.credential) | default(omit, true) }}"
credentials: "{{ __controller_role_item.0.credentials | default(__controller_role_item.credentials) | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
organization: "{{ __controller_role_item.0.organization | default(__controller_role_item.organization) | default(omit, true) }}"
organizations: "{{ __controller_role_item.0.organizations | default(__controller_role_item.organizations) | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
lookup_organization: "{{ __controller_role_item.0.lookup_organization | default(__controller_role_item.lookup_organization) | default(omit, true) }}"
project: "{{ __controller_role_item.0.project | default(__controller_role_item.project) | default(omit, true) }}"
projects: "{{ __controller_role_item.0.projects | default(__controller_role_item.projects) | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
instance_groups: "{{ __controller_role_item.0.instance_groups | default(__controller_role_item.instance_groups) | default(( [] if controller_configuration_role_enforce_defaults else omit), true) }}"
state: "{{ __controller_role_item.0.state | default(__controller_role_item.state) | default(controller_state | default('present')) }}"

# Role Standard Options
controller_username: "{{ controller_username | default(omit, true) }}"
Expand All @@ -74,8 +31,7 @@
controller_host: "{{ controller_hostname | default(omit, true) }}"
controller_config_file: "{{ controller_config_file | default(omit, true) }}"
validate_certs: "{{ controller_validate_certs | default(omit) }}"
loop: "{{ controller_roles }}"
when: not __controller_role_item.roles is defined
loop: "{{ ( controller_roles | subelements(['roles'], skip_missing=true)) + controller_roles | selectattr('roles', 'undefined') }}"
loop_control:
loop_var: __controller_role_item
no_log: "{{ controller_configuration_role_secure_logging }}"
Expand Down

0 comments on commit fe3f79a

Please sign in to comment.