Merge branch 'main' into docs/rebuild

Author: sjpb

docs/experimental/pulp.md

@@ -10,8 +10,8 @@ A playbook is provided to install and configure a Pulp server on a given host. A
 where `target_host` is any resolvable host. This will print a Pulp URL which can be copied to your environments as appropriate. Ensure that the server is accessible on the specified port. Note access to this server's content isn't authenticated so assumes the server is deployed behind a secure network.
 
 ### Using an existing Pulp server
-An existing Pulp server can be used to host Ark repos by overriding `pulp_site_password` and `appliances_pulp_url` in the target environment. Note that this assumes the same configuration as the appliance deployed pulp i.e no content authentication.
+An existing Pulp server can be used to host Ark repos by overriding `pulp_site_password` and `appliances_pulp_url` in the target environment. Note that this assumes the same configuration as the appliance deployed Pulp i.e no content authentication.
 
 ## Syncing Pulp content with Ark
 
-If the `pulp` group is added to the Packer build groups, the local Pulp server will be synced with Ark on build. You must authenticate with Ark by overriding `pulp_site_upstream_username` and `pulp_site_upstream_password` with your vault encrypted Ark dev credentials. `dnf_repos_username` and `dnf_repos_password` must remain unset to access content from the local Pulp. Content can also be synced by running `ansible/adhoc/sync-pulp.yml`. By default this syncs repositories for Rocky 9.5 with x86_64 architecture, but can be overriden by setting extravars for `pulp_site_target_arch`, `pulp_site_target_distribution`, `pulp_site_target_distribution_version` and `pulp_site_target_distribution_version_major`.
+If the `pulp` group is added to the Packer build groups, the local Pulp server will be synced with Ark on build. You must authenticate with Ark by overriding `pulp_site_upstream_username` and `pulp_site_upstream_password` with your vault encrypted Ark dev credentials. `dnf_repos_username` and `dnf_repos_password` must remain unset to access content from the local Pulp. Content can also be synced by running `ansible/adhoc/sync-pulp.yml`. By default this syncs repositories for Rocky 9.5 with x86_64 architecture, but can be overridden by setting extra variables for `pulp_site_target_arch`, `pulp_site_target_distribution`, `pulp_site_target_distribution_version` and `pulp_site_target_distribution_version_major`.

docs/operations.md

@@ -7,7 +7,7 @@ All subsequent sections assume that:
 - An Ansible vault secret is configured.
 - The correct private key is available to Ansible.
 - Appropriate OpenStack credentials are available.
-- Any non-appliance controlled infrastructure is avaialble (e.g. networks, volumes, etc.).
+- Any non-appliance controlled infrastructure is available (e.g. networks, volumes, etc.).
 - `$ENV` is your current, activated environment, as defined by e.g. `environments/production/`.
 - `$SITE_ENV` is the base site-specific environment, as defined by e.g. `environments/mysite/`.
 - A string `some/path/to/file.yml:myvar` defines a path relative to the repository root and an Ansible variable in that file.
@@ -27,7 +27,7 @@ This depends on how the cluster is accessed.
 
 The script `dev/ansible-ssh` may generally be used to connect to a host specified by a `inventory_hostname` using the same connection details as Ansible. If this does not work:
 - Instance IPs are normally defined in `ansible_host` variables in an inventory file `environments/$ENV/inventory/hosts{,.yml}`.
-- The ssh user is defined by `ansible_user`, default is `rocky`. This may be overriden in your environment.
+- The ssh user is defined by `ansible_user`, default is `rocky`. This may be overridden in your environment.
 - If a jump host is required the user and address may be defined in the above inventory file.
 
 # Modifying general Slurm.conf parameters
@@ -88,15 +88,15 @@ Additional packages can be added during image builds by:
         - anotherpackage
     ```
 
-For packages which come from repositories mirroed by StackHPC's "Ark" Pulp server
+For packages which come from repositories mirrored by StackHPC's "Ark" Pulp server
 (including rocky, EPEL and OpenHPC repositories), this will require either [Ark
 credentials](./image-build.md)) or a [local Pulp mirror](./experimental/pulp.md)
 to be configured. This includes rocky, EPEL and OpenHPC repos.
 
 The packages available from the OpenHPC repos are described in Appendix E of
 the OpenHPC installation guide (linked from the
 [OpenHPC releases page](https://github.com/openhpc/ohpc/releases/)). Note
-"user-facing" OpenHPC packages such as compilers, mpi libraries etc. include
+"user-facing" OpenHPC packages such as compilers, MPI libraries etc. include
 corresponding `lmod` modules.
 
 Packages *may* also be installed during the site.yml, by adding the `cluster`
@@ -142,7 +142,7 @@ Note that:
 - The above role provides variables to select specific partitions, nodes and interfaces which may be required. If not set in inventory, these can be passed as extravars:
 
         ansible-playbook ansible/adhoc/hpctests.yml -e hpctests_myvar=foo
-- The HPL-based test is only resonably optimised on Intel processors due the libaries and default parallelisation scheme used. For AMD processors it is recommended this
+- The HPL-based test is only reasonably optimised on Intel processors due the libraries and default parallelisation scheme used. For AMD processors it is recommended this
 is skipped using:
 
         ansible-playbook ansible/adhoc/hpctests.yml --skip-tags hpl-solo.

environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf

@@ -35,7 +35,7 @@ variable "login" {
     Mapping defining homogenous groups of login nodes. Multiple groups may
     be useful for e.g. separating nodes for ssh and Open Ondemand usage, or
     to define login nodes with different capabilities such as high-memory.
-    
+
     Keys are names of groups.
     Values are a mapping as follows:
 
@@ -45,7 +45,7 @@ variable "login" {
     Optional:
         image_id: Overrides variable cluster_image_id
         extra_networks: List of mappings in same format as cluster_networks
-        vnic_type: Overrides variable vnic_type
+        vnic_types: Overrides variable vnic_types
         volume_backed_instances: Overrides variable volume_backed_instances
         root_volume_size: Overrides variable root_volume_size
         extra_volumes: Mapping defining additional volumes to create and attach
@@ -84,7 +84,7 @@ variable "compute" {
         Optional:
             image_id: Overrides variable cluster_image_id
             extra_networks: List of mappings in same format as cluster_networks
-            vnic_type: Overrides variable vnic_type
+            vnic_types: Overrides variable vnic_types
             compute_init_enable: Toggles compute-init rebuild (see compute-init role docs)
             ignore_image_changes: Ignore changes to the image_id parameter (see docs/experimental/compute-init.md)
             volume_backed_instances: Overrides variable volume_backed_instances