From 0c46455a638e0b6669e0a34ff12cbef0d36f8a9f Mon Sep 17 00:00:00 2001 From: Alexander Gorelyshev Date: Thu, 18 Dec 2025 13:44:02 +0400 Subject: [PATCH] Fix linting issues --- roles/users/defaults/main.yml | 2 +- roles/users/molecule/default/verify.yml | 16 ++++++++-------- roles/users/molecule/users_from_var/verify.yml | 16 ++++++++-------- roles/users/tasks/create.yml | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/roles/users/defaults/main.yml b/roles/users/defaults/main.yml index cce8b27..755fb15 100644 --- a/roles/users/defaults/main.yml +++ b/roles/users/defaults/main.yml @@ -1,2 +1,2 @@ --- -default_home_root: /home +users_default_home_root: /home diff --git a/roles/users/molecule/default/verify.yml b/roles/users/molecule/default/verify.yml index a911e9d..da1af66 100644 --- a/roles/users/molecule/default/verify.yml +++ b/roles/users/molecule/default/verify.yml @@ -6,14 +6,14 @@ tasks: - name: "Get user info from /etc/passwd" - register: etc_passwd + register: users_etc_passwd changed_when: false ansible.builtin.shell: cmd: set -o pipefail; cat /etc/passwd | grep user executable: /bin/bash - name: "Get user info from /etc/shadow" - register: etc_shadow + register: users_etc_shadow changed_when: false ansible.builtin.shell: cmd: set -o pipefail; cat /etc/shadow | grep user @@ -30,21 +30,21 @@ - "user1:x:1002:1002:User One:/home/user1:/bin/sh" ansible.builtin.assert: that: - - etc_passwd.stdout_lines == expected_passwd - - etc_shadow.stdout_lines == expected_shadow + - users_etc_passwd.stdout_lines == expected_passwd + - users_etc_shadow.stdout_lines == expected_shadow - name: "Get SSH key contents for user1" - register: user1_ssh_key + register: users_user1_ssh_key changed_when: false ansible.builtin.command: cmd: cat /home/user1/.ssh/id_ed25519.pub - name: "Verify the SSH key contents for user1" ansible.builtin.assert: - that: "'user1@ubuntu' in user1_ssh_key.stdout" + that: "'user1@ubuntu' in users_user1_ssh_key.stdout" - name: "Get the user slice drop-in for user0" - register: user0_slice_dropin + register: users_user0_slice_dropin changed_when: false ansible.builtin.command: cmd: cat /etc/systemd/system/user-1001.slice.d/50-limits.conf @@ -59,6 +59,6 @@ - "CPUAccounting=1" - "CPUQuota=100%" ansible.builtin.assert: - that: "user0_slice_dropin.stdout_lines == expected" + that: "users_user0_slice_dropin.stdout_lines == expected" success_msg: "Got the expected limits slice drop-in" fail_msg: "Unexpected limits slice drop-in contents" diff --git a/roles/users/molecule/users_from_var/verify.yml b/roles/users/molecule/users_from_var/verify.yml index a911e9d..da1af66 100644 --- a/roles/users/molecule/users_from_var/verify.yml +++ b/roles/users/molecule/users_from_var/verify.yml @@ -6,14 +6,14 @@ tasks: - name: "Get user info from /etc/passwd" - register: etc_passwd + register: users_etc_passwd changed_when: false ansible.builtin.shell: cmd: set -o pipefail; cat /etc/passwd | grep user executable: /bin/bash - name: "Get user info from /etc/shadow" - register: etc_shadow + register: users_etc_shadow changed_when: false ansible.builtin.shell: cmd: set -o pipefail; cat /etc/shadow | grep user @@ -30,21 +30,21 @@ - "user1:x:1002:1002:User One:/home/user1:/bin/sh" ansible.builtin.assert: that: - - etc_passwd.stdout_lines == expected_passwd - - etc_shadow.stdout_lines == expected_shadow + - users_etc_passwd.stdout_lines == expected_passwd + - users_etc_shadow.stdout_lines == expected_shadow - name: "Get SSH key contents for user1" - register: user1_ssh_key + register: users_user1_ssh_key changed_when: false ansible.builtin.command: cmd: cat /home/user1/.ssh/id_ed25519.pub - name: "Verify the SSH key contents for user1" ansible.builtin.assert: - that: "'user1@ubuntu' in user1_ssh_key.stdout" + that: "'user1@ubuntu' in users_user1_ssh_key.stdout" - name: "Get the user slice drop-in for user0" - register: user0_slice_dropin + register: users_user0_slice_dropin changed_when: false ansible.builtin.command: cmd: cat /etc/systemd/system/user-1001.slice.d/50-limits.conf @@ -59,6 +59,6 @@ - "CPUAccounting=1" - "CPUQuota=100%" ansible.builtin.assert: - that: "user0_slice_dropin.stdout_lines == expected" + that: "users_user0_slice_dropin.stdout_lines == expected" success_msg: "Got the expected limits slice drop-in" fail_msg: "Unexpected limits slice drop-in contents" diff --git a/roles/users/tasks/create.yml b/roles/users/tasks/create.yml index 309a9c5..f952d08 100644 --- a/roles/users/tasks/create.yml +++ b/roles/users/tasks/create.yml @@ -16,7 +16,7 @@ - name: "Create | Create user account ('{{ user.name }}')" vars: - home_root: "{{ user.home_root is defined | ternary(user.home_root, default_home_root) }}" + home_root: "{{ user.home_root is defined | ternary(user.home_root, users_default_home_root) }}" ansible.builtin.user: name: "{{ user.name }}" state: "{{ user.state }}"