Skip to content

Commit 9cb0abb

Browse files
committed
README/whitespace fixes
1 parent f00ae6d commit 9cb0abb

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

ansible/roles/basic_users/README.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ basic_users
55
Setup users on cluster nodes using `/etc/passwd` and manipulating `$HOME`, i.e.
66
without requiring LDAP etc. Features:
77
- UID/GID is consistent across cluster (and explicitly defined).
8-
- SSH key generated and propagated to all nodes to allow login between cluster nodes.
8+
- SSH key generated and propagated to all nodes to allow login between cluster
9+
nodes.
910
- An "external" SSH key can be added to allow login from elsewhere.
1011
- Login to the control node is prevented (by default).
1112
- When deleting users, systemd user sessions are terminated first.
1213

13-
> [!IMPORTANT] This role assumes that `$HOME` for users managed by this role
14+
> [!IMPORTANT] This role assumes that `$HOME` for users managed by this role
1415
(e.g. not `rocky` and other system users) is on a shared filesystem. The export
1516
of this shared filesystem may be root squashed if its server is in the
1617
`basic_user` group - see configuration examples below.
@@ -24,9 +25,9 @@ Role Variables
2425
key creation, should not be set `true`.
2526
- `ssh_key_comment`: Default is user name.
2627
- `home`: Normally set automatically.
27-
- `uid` should be set, so that the UID/GID is consistent across the cluster
28+
- `uid`: Should be set, so that the UID/GID is consistent across the cluster
2829
(which Slurm requires).
29-
- `shell` If *not* set will be `/sbin/nologin` on the `control` node and the
30+
- `shell`: If *not* set will be `/sbin/nologin` on the `control` node and the
3031
default shell on other users. Explicitly setting this defines the shell for
3132
all nodes.
3233
- An additional key `public_key` may optionally be specified to define a key to log into the cluster.
@@ -36,14 +37,13 @@ Role Variables
3637
- `basic_users_groups`: Optional, default empty list. A list of mappings defining information for each group. Mapping keys/values are passed through as parameters to [ansible.builtin.group](https://docs.ansible.com/ansible/latest/collections/ansible/builtin/group_module.html) and default values are as given there.
3738
- `basic_users_override_sssd`: Optional bool, default false. Whether to disable `sssd` when ensuring users/groups exist with this role. Permits creating local users/groups even if they clash with users provided via sssd (e.g. from LDAP). Ignored if host is not in group `sssd` as well. Note with this option active `sssd` will be stopped and restarted each time this role is run.
3839
- `basic_users_homedir_host`: Optional inventory hostname defining the host
39-
to use to create home directories. If the home directory export is root squashed,
40-
this host *must* be the home directory server. Default is the `control` node,
41-
for the default appliance NFS-exported home directory configuration.
40+
to use to create home directories. If the home directory export is root
41+
squashed, this host *must* be the home directory server. Default is the
42+
`control` node which is appropriate for the default appliance configuration.
4243
Not relevant if `create_home` is false for all users.
4344
- `basic_users_homedir_host_path`: Optional path prefix for home directories on
4445
the `basic_users_homedir_host`, i.e. on the "server side". Default is
45-
`/exports/home`, for the default appliance NFS-exported home directory
46-
configuration.
46+
`/exports/home` which is appropriate for the default appliance configuration.
4747

4848
Dependencies
4949
------------
@@ -69,9 +69,12 @@ basic_users_users:
6969
state: absent
7070
```
7171
72-
Using an external share which does not root squash so this role can create
73-
directories on it, which is also mounted to the control node (so this role can
74-
set authorized keys there), create user `Carol`:
72+
Using an external share which:
73+
- does not root squash (so this role can create directories on it)
74+
- ismounted to all nodes including the control node (so this role can set
75+
authorized keys there),
76+
77+
create user `Carol`:
7578

7679
```yaml
7780
basic_users_homedir_host: "{{ ansible_play_hosts | first }}" # doesn't matter which host is used

ansible/roles/basic_users/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
label: "{{ item.name }}"
8888
when:
8989
- item.state | default('present') == 'present'
90-
90+
9191
- name: Generate cluster ssh key
9292
community.crypto.openssh_keypair:
9393
path: "{{ item.ssh_key_file | default('~/.ssh/' + _ssh_key_type )}}" # NB: ssh_key_file is from ansible.builtin.user

0 commit comments

Comments
 (0)