Skip to content

Commit c95006b

Browse files
authored
Merge pull request #530 from stackhpc/fix-typos
Fix various typos in documentation
2 parents 662f5ef + 3b09bd1 commit c95006b

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ This repository contains playbooks and configuration to define a Slurm-based HPC
66
- [Rocky Linux](https://rockylinux.org/)-based hosts.
77
- [OpenTofu](https://opentofu.org/) configurations to define the cluster's infrastructure-as-code.
88
- Packages for Slurm and MPI software stacks from [OpenHPC](https://openhpc.community/).
9-
- Shared fileystem(s) using NFS (with in-cluster or external servers) or [CephFS](https://docs.ceph.com/en/latest/cephfs/) via [Openstack Manila](https://wiki.openstack.org/wiki/Manila).
9+
- Shared fileystem(s) using NFS (with in-cluster or external servers) or [CephFS](https://docs.ceph.com/en/latest/cephfs/) via [OpenStack Manila](https://wiki.openstack.org/wiki/Manila).
1010
- Slurm accounting using a MySQL database.
1111
- Monitoring integrated with Slurm jobs using Prometheus, ElasticSearch and Grafana.
12-
- A web-based portal from [OpenOndemand](https://openondemand.org/).
12+
- A web-based portal from [Open OnDemand](https://openondemand.org/).
1313
- Production-ready default Slurm configurations for access and memory limits.
1414
- [Packer](https://developer.hashicorp.com/packer)-based image build configurations for node images.
1515

@@ -25,15 +25,15 @@ The default configuration in this repository may be used to create a cluster to
2525
- Persistent state backed by an OpenStack volume.
2626
- NFS-based shared file system backed by another OpenStack volume.
2727

28-
Note that the OpenOndemand portal and its remote apps are not usable with this default configuration.
28+
Note that the Open OnDemand portal and its remote apps are not usable with this default configuration.
2929

3030
It requires an OpenStack cloud, and an Ansible "deploy host" with access to that cloud.
3131

3232
Before starting ensure that:
3333
- You have root access on the deploy host.
3434
- You can create instances using a Rocky 9 GenericCloud image (or an image based on that).
3535
- **NB**: In general it is recommended to use the [latest released image](https://github.com/stackhpc/ansible-slurm-appliance/releases) which already contains the required packages. This is built and tested in StackHPC's CI.
36-
- You have a SSH keypair defined in OpenStack, with the private key available on the deploy host.
36+
- You have an SSH keypair defined in OpenStack, with the private key available on the deploy host.
3737
- Created instances have access to internet (note proxies can be setup through the appliance if necessary).
3838
- Created instances have accurate/synchronised time (for VM instances this is usually provided by the hypervisor; if not or for bare metal instances it may be necessary to configure a time service via the appliance).
3939

@@ -66,7 +66,7 @@ Use the `cookiecutter` template to create a new environment to hold your configu
6666

6767
and follow the prompts to complete the environment name and description.
6868

69-
**NB:** In subsequent sections this new environment is refered to as `$ENV`.
69+
**NB:** In subsequent sections this new environment is referred to as `$ENV`.
7070

7171
Activate the new environment:
7272

@@ -124,8 +124,8 @@ where the IP of the login node is given in `environments/$ENV/inventory/hosts.ym
124124
## Overview of directory structure
125125

126126
- `environments/`: See [docs/environments.md](docs/environments.md).
127-
- `ansible/`: Contains the ansible playbooks to configure the infrastruture.
128-
- `packer/`: Contains automation to use Packer to build machine images for an enviromment - see the README in this directory for further information.
127+
- `ansible/`: Contains the ansible playbooks to configure the infrastructure.
128+
- `packer/`: Contains automation to use Packer to build machine images for an environment - see the README in this directory for further information.
129129
- `dev/`: Contains development tools.
130130

131131
For further information see the [docs](docs/) directory.

docs/image-build.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ To build either a site-specific fat image from scratch, or to extend an existing
5151
5252
openstack image unset --property signature_verified $SOURCE_IMAGE
5353
54-
then delete the failed volume, select cancelling the build when Packer queries, and then retry. This is [Openstack bug 1823445](https://bugs.launchpad.net/cinder/+bug/1823445).
54+
then delete the failed volume, select cancelling the build when Packer queries, and then retry. This is [OpenStack bug 1823445](https://bugs.launchpad.net/cinder/+bug/1823445).
5555
5656
6. The built image will be automatically uploaded to OpenStack with a name prefixed `openhpc` and including a timestamp and a shortened git hash.
5757

docs/monitoring-and-logging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ The `grafana` group controls the placement of the grafana service. Load balancin
9696

9797
### Access
9898

99-
If Open Ondemand is enabled then by default this is used to proxy Grafana, otherwise Grafana is accessed through the first . See `grafana_url` in [environments/common/inventory/group_vars/all/grafana.yml](../environments/common/inventory/group_vars/all/grafana.yml). The port used (variable `grafana_port`) defaults to `3000`.
99+
If Open OnDemand is enabled then by default this is used to proxy Grafana, otherwise Grafana is accessed through the first . See `grafana_url` in [environments/common/inventory/group_vars/all/grafana.yml](../environments/common/inventory/group_vars/all/grafana.yml). The port used (variable `grafana_port`) defaults to `3000`.
100100

101101
The default credentials for the admin user are:
102102

docs/openondemand.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
# Overview
22

3-
The appliance can deploy the Open Ondemand portal. This page describes how to enable this and the default appliance configuration/behaviour. Note that detailed configuration documentation is provided by:
3+
The appliance can deploy the Open OnDemand portal. This page describes how to enable this and the default appliance configuration/behaviour. Note that detailed configuration documentation is provided by:
44

55
- The README for the included `openondemand` role in this repo - [ansible/roles/openondemand/README.md](../ansible/roles/openondemand/README.md).
66
- The README and default variables for the underlying "official" role which the above wraps - [Open OnDemand Ansible Role](https://github.com/OSC/ood-ansible)
7-
- The documentation for Open Ondemand [itself](https://osc.github.io/ood-documentation/latest/index.html)
7+
- The documentation for Open OnDemand [itself](https://osc.github.io/ood-documentation/latest/index.html)
88

99
This appliance can deploy and configure:
10-
- The Open Ondemand server itself (usually on a single login node).
10+
- The Open OnDemand server itself (usually on a single login node).
1111
- User authentication using one of:
1212
- An external OIDC provider.
1313
- HTTP basic authenication and PAM.
1414
- Virtual desktops on compute nodes.
1515
- Jupyter nodebook servers on compute nodes.
16-
- Proxying of Grafana (usually deployed on the control node) via the Open Ondemand portal.
17-
- Links to additional filesystems and pages from the Open Ondemand Dashboard.
18-
- A Prometheus exporter for the Open Ondemand server and related Grafana dashboard
16+
- Proxying of Grafana (usually deployed on the control node) via the Open OnDemand portal.
17+
- Links to additional filesystems and pages from the Open OnDemand Dashboard.
18+
- A Prometheus exporter for the Open OnDemand server and related Grafana dashboard
1919

2020
For examples of all of the above see the `smslabs-example` environment in this repo.
2121

22-
# Enabling Open Ondemand
23-
To enable the Open Ondemand server, add single host to the `openondemand` inventory group. Generally, this should be a node in the `login` group, as Open Ondemand must be able to access Slurm commands.
22+
# Enabling Open OnDemand
23+
To enable the Open OnDemand server, add single host to the `openondemand` inventory group. Generally, this should be a node in the `login` group, as Open OnDemand must be able to access Slurm commands.
2424

25-
To enable compute nodes for virtual desktops or Jupyter notebook servers (accessed through the Open Ondemand portal), add nodes/groups to the `openondemand_desktop` and `openondemand_jupyter` inventory groups respectively. These may be all or a subset of the `compute` group.
25+
To enable compute nodes for virtual desktops or Jupyter notebook servers (accessed through the Open OnDemand portal), add nodes/groups to the `openondemand_desktop` and `openondemand_jupyter` inventory groups respectively. These may be all or a subset of the `compute` group.
2626

2727
The above functionality is configured by running the `ansible/portal.yml` playbook. This is automatically run as part of `ansible/site.yml`.
2828

2929
# Default configuration
3030

3131
See the [ansible/roles/openondemand/README.md](../ansible/roles/openondemand/README.md) for more details on the variables described below.
3232

33-
The following variables have been given default values to allow Open Ondemand to work in a newly created environment without additional configuration, but generally should be overridden in `environment/site/inventory/group_vars/all/` with site-specific values:
33+
The following variables have been given default values to allow Open OnDemand to work in a newly created environment without additional configuration, but generally should be overridden in `environment/site/inventory/group_vars/all/` with site-specific values:
3434
- `openondemand_servername` - this must be defined for both `openondemand` and `grafana` hosts (when Grafana is enabled). Default is `ansible_host` (i.e. the IP address) of the first host in the `openondemand` group.
3535
- `openondemand_auth` and any corresponding options. Defaults to `basic_pam`.
3636
- `openondemand_desktop_partition` and `openondemand_jupyter_partition` if the corresponding inventory groups are defined. Defaults to the first compute group defined in the `compute` Terraform variable in `environments/$ENV/terraform`.
@@ -41,9 +41,9 @@ It is also recommended to set:
4141

4242
If shared filesystems other than `$HOME` are available, add paths to `openondemand_filesapp_paths`.
4343

44-
The appliance automatically configures Open Ondemand to proxy Grafana and adds a link to it on the Open Ondemand dashboard. This means no external IP (or SSH proxying etc) is required to access Grafana (which by default is deployed on the control node). To allow users to authenticate to Grafana, the simplest option is to enable anonymous (View-only) login by setting `grafana_auth_anonymous` (see [environments/common/inventory/group_vars/all/grafana.yml](../environments/common/inventory/group_vars/all/grafana.yml)[^1]).
44+
The appliance automatically configures Open OnDemand to proxy Grafana and adds a link to it on the Open OnDemand dashboard. This means no external IP (or SSH proxying etc) is required to access Grafana (which by default is deployed on the control node). To allow users to authenticate to Grafana, the simplest option is to enable anonymous (View-only) login by setting `grafana_auth_anonymous` (see [environments/common/inventory/group_vars/all/grafana.yml](../environments/common/inventory/group_vars/all/grafana.yml)[^1]).
4545

46-
[^1]: Note that if `openondemand_auth` is `basic_pam` and anonymous Grafana login is enabled, the appliance will (by default) configure Open Ondemand's Apache server to remove the Authorisation header from proxying of all `node/` addresses. This is done as otherwise Grafana tries to use this header to authenticate, which fails with the default configuration where only the admin Grafana user `grafana` is created. Note that the removal of this header in this configuration means it cannot be used to authenticate proxied interactive applications - however the appliance-deployed remote desktop and Jupyter Notebook server applications use other authentication methods. An alternative if using `basic_pam` is not to enable anonymous Grafana login and to create Grafana users matching the local users (e.g. in `environments/<env>/hooks/post.yml`).
46+
[^1]: Note that if `openondemand_auth` is `basic_pam` and anonymous Grafana login is enabled, the appliance will (by default) configure Open OnDemand's Apache server to remove the Authorisation header from proxying of all `node/` addresses. This is done as otherwise Grafana tries to use this header to authenticate, which fails with the default configuration where only the admin Grafana user `grafana` is created. Note that the removal of this header in this configuration means it cannot be used to authenticate proxied interactive applications - however the appliance-deployed remote desktop and Jupyter Notebook server applications use other authentication methods. An alternative if using `basic_pam` is not to enable anonymous Grafana login and to create Grafana users matching the local users (e.g. in `environments/<env>/hooks/post.yml`).
4747

4848
# Access
4949
By default the appliance authenticates against OOD with basic auth through PAM. When creating a new environment, a new user with username `demo_user` will be created. Its password is found under `vault_openondemand_default_user` in the appliance secrets store in `environments/{ENV}/inventory/group_vars/all/secrets.yml`. Other users can be defined by overriding the `basic_users_users` variable in your environment (templated into `environments/{ENV}/inventory/group_vars/all/basic_users.yml` by default).

docs/production.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ and referenced from the `site` and `production` environments, e.g.:
9696
cluster
9797
```
9898

99-
- Configure Open OpenOndemand - see [specific documentation](openondemand.README.md).
99+
- Configure Open OnDemand - see [specific documentation](openondemand.README.md).
100100

101101
- Remove the `demo_user` user from `environments/$ENV/inventory/group_vars/all/basic_users.yml`
102102

0 commit comments

Comments
 (0)