Skip to content

Commit

Permalink
Merge pull request #1171 from SkylerMalinowski/slurm-gcp-5.6.3
Browse files Browse the repository at this point in the history
Update SchedMD modules to 5.6.3 (from 5.6.2)
  • Loading branch information
cboneti authored Apr 17, 2023
2 parents ea2ffe1 + 8e1acd7 commit 6253c2d
Show file tree
Hide file tree
Showing 16 changed files with 45 additions and 45 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

# Most variables have been sourced and modified from the SchedMD/slurm-gcp
# github repository: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
# github repository: https://github.com/SchedMD/slurm-gcp/tree/5.6.3

variable "project_id" {
description = "Project in which the HPC deployment will be created."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ limitations under the License.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_slurm_partition"></a> [slurm\_partition](#module\_slurm\_partition) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition | 5.6.2 |
| <a name="module_slurm_partition"></a> [slurm\_partition](#module\_slurm\_partition) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition | 5.6.3 |

## Resources

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ data "google_compute_zones" "available" {
}

module "slurm_partition" {
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition?ref=5.6.2"
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition?ref=5.6.3"

slurm_cluster_name = local.slurm_cluster_name
partition_nodes = var.node_groups
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

# Most variables have been sourced and modified from the SchedMD/slurm-gcp
# github repository: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
# github repository: https://github.com/SchedMD/slurm-gcp/tree/5.6.3

variable "deployment_name" {
description = "Name of the deployment."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ controller for optimal performance at different scales.
> [SchedMD/slurm-gcp]. See the
> [documentation below](#live-cluster-reconfiguration-enable_reconfigure).
[SchedMD/slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
[slurm\_controller\_instance]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2/terraform/slurm_cluster/modules/slurm_controller_instance
[slurm\_instance\_template]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2/terraform/slurm_cluster/modules/slurm_instance_template
[SchedMD/slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3
[slurm\_controller\_instance]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3/terraform/slurm_cluster/modules/slurm_controller_instance
[slurm\_instance\_template]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3/terraform/slurm_cluster/modules/slurm_instance_template
[slurm-ug]: https://goo.gle/slurm-gcp-user-guide.
[requirements.txt]: https://github.com/SchedMD/slurm-gcp/blob/5.6.2/scripts/requirements.txt
[requirements.txt]: https://github.com/SchedMD/slurm-gcp/blob/5.6.3/scripts/requirements.txt
[enable\_cleanup\_compute]: #input\_enable\_cleanup\_compute
[enable\_cleanup\_subscriptions]: #input\_enable\_cleanup\_subscriptions
[enable\_reconfigure]: #input\_enable\_reconfigure
Expand Down Expand Up @@ -77,7 +77,7 @@ This option has some additional requirements:
development environment deploying the cluster. One can use following commands:

```bash
wget https://raw.githubusercontent.com/SchedMD/slurm-gcp/5.6.2/scripts/requirements.txt
wget https://raw.githubusercontent.com/SchedMD/slurm-gcp/5.6.3/scripts/requirements.txt
pip3 install -r requirements.txt --user
```

Expand All @@ -99,7 +99,7 @@ This option has some additional requirements:
TopicByProjectIdAndName(project_id=<incorrect project #>, topic_name=<topic name>)
```

[optdeps]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2/terraform/slurm_cluster#optional
[optdeps]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3/terraform/slurm_cluster#optional

## Custom Images

Expand Down Expand Up @@ -163,8 +163,8 @@ limitations under the License.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_slurm_controller_instance"></a> [slurm\_controller\_instance](#module\_slurm\_controller\_instance) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_instance | 5.6.2 |
| <a name="module_slurm_controller_template"></a> [slurm\_controller\_template](#module\_slurm\_controller\_template) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 5.6.2 |
| <a name="module_slurm_controller_instance"></a> [slurm\_controller\_instance](#module\_slurm\_controller\_instance) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_instance | 5.6.3 |
| <a name="module_slurm_controller_template"></a> [slurm\_controller\_template](#module\_slurm\_controller\_template) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 5.6.3 |

## Resources

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ data "google_compute_default_service_account" "default" {
}

module "slurm_controller_instance" {
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_instance?ref=5.6.2"
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_instance?ref=5.6.3"

access_config = local.access_config
slurm_cluster_name = local.slurm_cluster_name
Expand Down Expand Up @@ -92,7 +92,7 @@ module "slurm_controller_instance" {
}

module "slurm_controller_template" {
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=5.6.2"
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=5.6.3"

additional_disks = local.additional_disks
can_ip_forward = var.can_ip_forward
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

# Most variables have been sourced and modified from the SchedMD/slurm-gcp
# github repository: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
# github repository: https://github.com/SchedMD/slurm-gcp/tree/5.6.3

variable "access_config" {
description = "Access configurations, i.e. IPs via which the VM instance can be accessed via the Internet."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ manually. This will require addition configuration and verification of
permissions. For more information see the [hybrid.md] documentation on
[slurm-gcp].

[slurm-controller-hybrid]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2/terraform/slurm_cluster/modules/slurm_controller_hybrid
[slurm-controller-hybrid]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3/terraform/slurm_cluster/modules/slurm_controller_hybrid

> **_NOTE:_** The hybrid module requires the following dependencies to be
> installed on the system deploying the module:
Expand All @@ -58,15 +58,15 @@ permissions. For more information see the [hybrid.md] documentation on
[pyyaml]: https://pypi.org/project/PyYAML/
[google-api-python-client]: https://pypi.org/project/google-api-python-client/
[google-cloud-pubsub]: https://pypi.org/project/google-cloud-pubsub/
[requirements.txt]: https://github.com/SchedMD/slurm-gcp/blob/5.6.2/scripts/requirements.txt
[requirements.txt]: https://github.com/SchedMD/slurm-gcp/blob/5.6.3/scripts/requirements.txt

### Manual Configuration
This module *does not* complete the installation of hybrid partitions on your
slurm cluster. After deploying, you must follow the steps listed out in the
[hybrid.md] documentation under [manual steps].

[hybrid.md]: https://github.com/SchedMD/slurm-gcp/blob/5.6.2/docs/hybrid.md
[manual steps]: https://github.com/SchedMD/slurm-gcp/blob/5.6.2/docs/hybrid.md#manual-configurations
[hybrid.md]: https://github.com/SchedMD/slurm-gcp/blob/5.6.3/docs/hybrid.md
[manual steps]: https://github.com/SchedMD/slurm-gcp/blob/5.6.3/docs/hybrid.md#manual-configurations

### Example Usage
The hybrid module can be added to a blueprint as follows:
Expand Down Expand Up @@ -146,10 +146,10 @@ strongly advise only using versions 21 or 22 when using this module. Attempting
to use this module with any version older than 21 may lead to unexpected
results.

[slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
[slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3
[pre-existing-network-storage]: ../../../../modules/file-system/pre-existing-network-storage/
[schedmd-slurm-gcp-v5-partition]: ../../compute/schedmd-slurm-gcp-v5-partition/
[packer templates]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2/packer
[packer templates]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3/packer

## License
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
Expand Down Expand Up @@ -181,7 +181,7 @@ No providers.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_slurm_controller_instance"></a> [slurm\_controller\_instance](#module\_slurm\_controller\_instance) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_hybrid | 5.6.2 |
| <a name="module_slurm_controller_instance"></a> [slurm\_controller\_instance](#module\_slurm\_controller\_instance) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_hybrid | 5.6.3 |

## Resources

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ locals {
}

module "slurm_controller_instance" {
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_hybrid?ref=5.6.2"
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_hybrid?ref=5.6.3"

project_id = var.project_id
slurm_cluster_name = local.slurm_cluster_name
Expand Down
14 changes: 7 additions & 7 deletions community/modules/scheduler/schedmd-slurm-gcp-v5-login/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ This module creates a login node for a Slurm cluster based on the
terraform modules. The login node is used in conjunction with the
[Slurm controller](../schedmd-slurm-gcp-v5-controller/README.md).

[SchedMD/slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
[slurm\_login\_instance]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2/terraform/slurm_cluster/modules/slurm_login_instance
[slurm\_instance\_template]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2/terraform/slurm_cluster/modules/slurm_instance_template
[SchedMD/slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3
[slurm\_login\_instance]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3/terraform/slurm_cluster/modules/slurm_login_instance
[slurm\_instance\_template]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3/terraform/slurm_cluster/modules/slurm_instance_template

### Example

Expand Down Expand Up @@ -49,8 +49,8 @@ The HPC Toolkit team maintains the wrapper around the [slurm-on-gcp] terraform
modules. For support with the underlying modules, see the instructions in the
[slurm-gcp README][slurm-gcp-readme].

[slurm-on-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
[slurm-gcp-readme]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2#slurm-on-google-cloud-platform
[slurm-on-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3
[slurm-gcp-readme]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3#slurm-on-google-cloud-platform

## License
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
Expand Down Expand Up @@ -85,8 +85,8 @@ limitations under the License.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_slurm_login_instance"></a> [slurm\_login\_instance](#module\_slurm\_login\_instance) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_login_instance | 5.6.2 |
| <a name="module_slurm_login_template"></a> [slurm\_login\_template](#module\_slurm\_login\_template) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 5.6.2 |
| <a name="module_slurm_login_instance"></a> [slurm\_login\_instance](#module\_slurm\_login\_instance) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_login_instance | 5.6.3 |
| <a name="module_slurm_login_template"></a> [slurm\_login\_template](#module\_slurm\_login\_template) | github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 5.6.3 |

## Resources

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ data "google_compute_default_service_account" "default" {
}

module "slurm_login_template" {
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=5.6.2"
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=5.6.3"

additional_disks = local.additional_disks
can_ip_forward = var.can_ip_forward
Expand Down Expand Up @@ -91,7 +91,7 @@ module "slurm_login_template" {
}

module "slurm_login_instance" {
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_login_instance?ref=5.6.2"
source = "github.com/SchedMD/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_login_instance?ref=5.6.3"

access_config = local.access_config
slurm_cluster_name = local.slurm_cluster_name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

# Most variables have been sourced and modified from the SchedMD/slurm-gcp
# github repository: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
# github repository: https://github.com/SchedMD/slurm-gcp/tree/5.6.3

variable "project_id" {
type = string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ for use with an on-premise slurm-cluster.
> further testing is done, documentation on applying the hybrid module to
> on-premise slurm clusters will be added and expanded.
[slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
[slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3

## Definitions

Expand Down
4 changes: 2 additions & 2 deletions docs/hybrid-slurm-cluster/deploy-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ sudo systemctl restart slurmctld
If the restart did not succeed, the logs at `/var/log/slurm/slurmctld.log`
should point you in the right direction.

[slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
[slurm-gcp-hybrid]: https://github.com/SchedMD/slurm-gcp/blob/5.6.2/docs/hybrid.md
[slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3
[slurm-gcp-hybrid]: https://github.com/SchedMD/slurm-gcp/blob/5.6.3/docs/hybrid.md
[demo-with-cloud-controller-instructions.md]: ./demo-with-cloud-controller-instructions.md

## Validate the Hybrid Cluster
Expand Down
16 changes: 8 additions & 8 deletions docs/hybrid-slurm-cluster/on-prem-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ detail, as well as how to customize many of these assumptions to fit your needs.
deployments in their [hybrid.md] documentation.

[hybridmodule]: ../../community/modules/scheduler/schedmd-slurm-gcp-v5-hybrid/README.md
[slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2
[slurm-gcp]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3
[slurm\_controller\_hybrid]: https://github.com/SchedMD/slurm-gcp/tree/master/terraform/slurm_cluster/modules/slurm_controller_hybrid
[hybrid.md]: https://github.com/SchedMD/slurm-gcp/blob/5.6.2/docs/hybrid.md
[hybrid.md]: https://github.com/SchedMD/slurm-gcp/blob/5.6.3/docs/hybrid.md

### NFS Mounts

Expand Down Expand Up @@ -235,12 +235,12 @@ image created with slurm 21.08.8:
partition_name: compute
```
[slurmgcppacker]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2/packer
[example.pkrvars.hcl]: https://github.com/SchedMD/slurm-gcp/tree/5.6.2/packer/example.pkrvars.hcl
[slurmversion]: https://github.com/SchedMD/slurm-gcp/blob/5.6.2/packer/variables.pkr.hcl#L97
[`service_account_scopes`]: https://github.com/SchedMD/slurm-gcp/blob/5.6.2/packer/variables.pkr.hcl#L166
[`munge_user`]: https://github.com/SchedMD/slurm-gcp/blob/5.6.2/ansible/roles/munge/defaults/main.yml#L17
[`slurm_user`]: https://github.com/SchedMD/slurm-gcp/blob/5.6.2/ansible/roles/slurm/defaults/main.yml#L31
[slurmgcppacker]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3/packer
[example.pkrvars.hcl]: https://github.com/SchedMD/slurm-gcp/tree/5.6.3/packer/example.pkrvars.hcl
[slurmversion]: https://github.com/SchedMD/slurm-gcp/blob/5.6.3/packer/variables.pkr.hcl#L97
[`service_account_scopes`]: https://github.com/SchedMD/slurm-gcp/blob/5.6.3/packer/variables.pkr.hcl#L166
[`munge_user`]: https://github.com/SchedMD/slurm-gcp/blob/5.6.3/ansible/roles/munge/defaults/main.yml#L17
[`slurm_user`]: https://github.com/SchedMD/slurm-gcp/blob/5.6.3/ansible/roles/slurm/defaults/main.yml#L31

## On Premise Setup

Expand Down
2 changes: 1 addition & 1 deletion tools/cloud-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ WORKDIR /ghpc-tmp
COPY ./ ./

RUN pip install --no-cache-dir --upgrade pip && \
pip install --no-cache-dir -r https://raw.githubusercontent.com/SchedMD/slurm-gcp/5.6.2/scripts/requirements.txt && \
pip install --no-cache-dir -r https://raw.githubusercontent.com/SchedMD/slurm-gcp/5.6.3/scripts/requirements.txt && \
pip install --no-cache-dir -r tools/cloud-build/requirements.txt && \
rm -rf ~/.cache/pip/*

Expand Down

0 comments on commit 6253c2d

Please sign in to comment.