Skip to content

Commit 731f020

Browse files
committed
address linter docs errors
1 parent b917e04 commit 731f020

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

ansible/roles/squid/README.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,21 @@ Deploy a caching proxy.
44

55
**NB:** This role provides two default configurations, selected by setting
66
`squid_conf_mode`:
7+
78
- `default`: This is aimed at providing a proxy for package installs etc.
89
for nodes which do not have direct internet connectivity. It assumes access
910
to the proxy is protected by the OpenStack security groups applied to the
1011
cluster. The generated configuration should be reviewed if this is not case.
1112
- `eessi`: This provides a proxy server for EESSI clients. It uses the
1213
[recommended configuration](https://www.eessi.io/docs/tutorial/access/proxy/#configuration)
1314
which assumes a server with:
14-
- 10Gbit link or faster to the client systems
15-
- a sufficiently powerful CPU
16-
- a decent amount of memory for the kernel cache (tens of GBs)
17-
- fast local storage - 50GB is used for cache
15+
16+
- 10Gbit link or faster to the client systems
17+
- a sufficiently powerful CPU
18+
- a decent amount of memory for the kernel cache (tens of GBs)
19+
- fast local storage
20+
- 50GB is used for cache
21+
1822
For this use-case the above link recommends at least two squid servers and at
1923
least one for every (100-500) client nodes.
2024

@@ -28,6 +32,7 @@ Deploy a caching proxy.
2832
### Role Variables for squid_conf_mode: default
2933

3034
Where noted these map to squid parameters of the same name without the `squid_` prefix - see [squid documentation](https://www.squid-cache.org/Doc/config) for details.
35+
3136
- `squid_started`: Optional bool. Whether to start squid service. Default `true`.
3237
- `squid_enabled`: Optional bool. Whether squid service is enabled on boot. Default `true`.
3338
- `squid_cache_mem`: Required str. Size of memory cache, e.g "1024 KB", "12 GB" etc. See squid parameter.

docs/eessi.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,22 +129,24 @@ additional_nodegroups = {
129129

130130
EESSI [recommend](https://www.eessi.io/docs/tutorial/access/proxy/#general-recommendations)
131131
that:
132+
132133
> The proxy server should have a 10Gbit link to the client systems, a
133-
sufficiently powerful CPU, a decent amount of memory for the kernel cache (tens
134-
of GBs), and fast local storage (SSD or NVMe).
134+
> sufficiently powerful CPU, a decent amount of memory for the kernel cache (tens
135+
> of GBs), and fast local storage (SSD or NVMe).
135136
>
136137
> As a rule of thumb, it is recommended to have (at least) one proxy server for
137-
every couple of hundred worker nodes (100-500).
138+
> every couple of hundred worker nodes (100-500).
138139
139140
Generally, both the `squid` nodes and the `eeesi` client nodes can be
140141
appropriately configured simply by setting the squid mode to `eessi`:
141142

142-
```yaml
143-
# environments/site/inventory/group_vars/all/squid.yml:
144-
squid_conf_mode: eessi
145-
```
143+
```yaml
144+
# environments/site/inventory/group_vars/all/squid.yml:
145+
squid_conf_mode: eessi
146+
```
146147
147148
In this mode, by default:
149+
148150
- `squid` is configured to allow clients from the access network's CIDR, using
149151
the EESSI-recommended cache configuration
150152
- `eessi` is configured to use the `squid` node IPs on the access network (the

0 commit comments

Comments
 (0)