Skip to content

Commit 66f0e7e

Browse files
committed
Reverting changes made to ansible.builtin.user and ansible.builtin.group where the name parameter was added.
Reverting to ansible.builtin.group: <args> becasue args aren't an expected label: groupadd: '{'name': 'grafana', 'gid': 979}' is not a valid group name
1 parent de0b35f commit 66f0e7e

File tree

5 files changed

+7
-14
lines changed

5 files changed

+7
-14
lines changed

ansible/bootstrap.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@
8282
search_string: HOSTNAME=$(/usr/bin/hostnamectl --transient 2>/dev/null) || \
8383
state: absent
8484
- name: Add system user groups
85-
ansible.builtin.group:
86-
name: "{{ item.group }}"
85+
ansible.builtin.group: "{{ item.group }}"
8786
loop: "{{ appliances_local_users }}"
8887
when:
8988
- item.enable | default(true) | bool
@@ -92,8 +91,7 @@
9291
# Need to change working directory otherwise we try to switch back to non-existent directory.
9392
become_flags: "-i"
9493
- name: Add system users
95-
ansible.builtin.user:
96-
name: "{{ item.user }}"
94+
ansible.builtin.user: "{{ item.user }}"
9795
loop: "{{ appliances_local_users }}"
9896
when: item.enable | default(true) | bool
9997
become_method: ansible.builtin.sudo

ansible/fatimage.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,7 @@
202202
# can't run cloudalchemy.prometheus/tasks/install.yml as it triggers a unit start
203203
# so below is a partial extraction of this:
204204
- name: Create prometheus system group
205-
ansible.builtin.group:
206-
name: prometheus
205+
ansible.builtin.group: prometheus
207206
system: true
208207
state: present
209208

ansible/roles/alertmanager/tasks/install.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
- name: Create alertmanager system user
3-
ansible.builtin.user:
4-
name: "{{ alertmanager_system_user }}"
3+
ansible.builtin.user: "{{ alertmanager_system_user }}"
54
system: true
65
create_home: false
76

ansible/roles/basic_users/tasks/main.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@
1818
- basic_users_override_sssd | bool
1919

2020
- name: Create groups
21-
ansible.builtin.group:
22-
name: "{{ item }}"
21+
ansible.builtin.group: "{{ item }}"
2322
loop: "{{ basic_users_groups }}"
2423

2524
- name: Create users
26-
ansible.builtin.user:
27-
name: "{{ basic_users_userdefaults | combine(item) | filter_user_params() | combine(_disable_homedir) }}"
25+
ansible.builtin.user: "{{ basic_users_userdefaults | combine(item) | filter_user_params() | combine(_disable_homedir) }}"
2826
loop: "{{ basic_users_users }}"
2927
loop_control:
3028
label: "{{ item.name }}"

ansible/roles/podman/tasks/configure.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
- name: Reset ssh connection to allow user changes to affect 'current login user'
4040
ansible.builtin.meta: reset_connection
4141
- name: Ensure podman users exist
42-
ansible.builtin.user:
43-
name: "{{ item }}"
42+
ansible.builtin.user: "{{ item }}"
4443
with_items: "{{ podman_users }}"
4544
register: podman_user_info
4645
become: true

0 commit comments

Comments
 (0)