diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2019-06-01 17:52:28 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2019-06-01 17:52:28 +0200 |
| commit | 22d4ec550391e5e013e46347a908179b0c769ff3 (patch) | |
| tree | fdb33ea899b753295e29f433d35cf77f8eee6464 /roles/admin-user | |
| parent | fix cloud-install role (diff) | |
| parent | with_dict -> loop (diff) | |
Merge branch 'no-more-with'
Diffstat (limited to 'roles/admin-user')
| -rw-r--r-- | roles/admin-user/tasks/main.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/roles/admin-user/tasks/main.yml b/roles/admin-user/tasks/main.yml index 5933863d..53eea376 100644 --- a/roles/admin-user/tasks/main.yml +++ b/roles/admin-user/tasks/main.yml @@ -5,7 +5,9 @@ state: present - name: add admin users - with_items: "{{ admin_user_group | default([]) | union(admin_user_host | default([])) }}" + loop: "{{ admin_user_group | default([]) | union(admin_user_host | default([])) }}" + loop_control: + label: "{{ item.name }}" user: name: "{{ item.name }}" state: present @@ -15,14 +17,12 @@ - adm append: yes shell: "{{ item.shell | default(omit) }}" - loop_control: - label: "{{ item.name }}" - name: install ssh keys for admin users - with_items: "{{ admin_user_group | default([]) | union(admin_user_host | default([])) }}" + loop: "{{ admin_user_group | default([]) | union(admin_user_host | default([])) }}" + loop_control: + label: "{{ item.name }}" authorized_key: user: "{{ item.name }}" key: "{{ item.ssh_keys | join('\n') }}" exclusive: yes - loop_control: - label: "{{ item.name }}" |