Skip to content

Commit

Permalink
Update slurm references to test changing default for subnetwork_project
Browse files Browse the repository at this point in the history
  • Loading branch information
alyssa-sm committed Oct 30, 2024
1 parent 2e56482 commit 0ce4230
Show file tree
Hide file tree
Showing 28 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion community/examples/hpc-build-slurm-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ vars:
image_build_machine_type: n2d-standard-16
build_from_image_family: hpc-rocky-linux-8
build_from_image_project: cloud-hpc-image-public
build_from_git_ref: 6.8.2
build_from_git_ref: change-v6-subnetwork-project-default-to-null
built_image_family: my-custom-slurm
built_instance_image:
family: $(vars.built_image_family)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ No providers.
| Name | Source | Version |
|------|--------|---------|
| <a name="module_slurm_partition"></a> [slurm\_partition](#module\_slurm\_partition) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition | 5.12.1 |
| <a name="module_slurm_partition"></a> [slurm\_partition](#module\_slurm\_partition) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition | change-v5-subnetwork-project-default-to-null |
## Resources
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ locals {
}

module "slurm_partition" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition?ref=5.12.1"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition?ref=change-v5-subnetwork-project-default-to-null"

slurm_cluster_name = local.slurm_cluster_name
enable_job_exclusive = var.exclusive
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ limitations under the License.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_slurm_partition"></a> [slurm\_partition](#module\_slurm\_partition) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition | 5.12.1 |
| <a name="module_slurm_partition"></a> [slurm\_partition](#module\_slurm\_partition) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition | change-v5-subnetwork-project-default-to-null |

## 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/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition?ref=5.12.1"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_partition?ref=change-v5-subnetwork-project-default-to-null"

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 @@ -74,7 +74,7 @@ modules. For support with the underlying modules, see the instructions in the
| Name | Source | Version |
|------|--------|---------|
| <a name="module_slurm_nodeset_template"></a> [slurm\_nodeset\_template](#module\_slurm\_nodeset\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 6.8.2 |
| <a name="module_slurm_nodeset_template"></a> [slurm\_nodeset\_template](#module\_slurm\_nodeset\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | change-v6-subnetwork-project-default-to-null |
## Resources
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ locals {
}

module "slurm_nodeset_template" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=6.8.2"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=change-v6-subnetwork-project-default-to-null"

project_id = var.project_id
region = var.region
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ controller for optimal performance at different scales.
>
> ```shell
> # Install Python3 and run
> pip3 install -r https://raw.githubusercontent.com/GoogleCloudPlatform/slurm-gcp/5.12.1/scripts/requirements.txt
> pip3 install -r https://raw.githubusercontent.com/GoogleCloudPlatform/slurm-gcp/change-v5-subnetwork-project-default-to-null/scripts/requirements.txt
> ```
[SchedMD/slurm-gcp]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/5.12.1
[slurm\_controller\_instance]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/5.12.1/terraform/slurm_cluster/modules/slurm_controller_instance
[slurm\_instance\_template]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/5.12.1/terraform/slurm_cluster/modules/slurm_instance_template
[SchedMD/slurm-gcp]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null
[slurm\_controller\_instance]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null/terraform/slurm_cluster/modules/slurm_controller_instance
[slurm\_instance\_template]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null/terraform/slurm_cluster/modules/slurm_instance_template
[slurm-ug]: https://goo.gle/slurm-gcp-user-guide.
[requirements.txt]: https://github.com/GoogleCloudPlatform/slurm-gcp/blob/5.12.1/scripts/requirements.txt
[requirements.txt]: https://github.com/GoogleCloudPlatform/slurm-gcp/blob/change-v5-subnetwork-project-default-to-null/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 @@ -99,12 +99,12 @@ This option has some additional requirements:
development environment deploying the cluster. One can use following commands:

```bash
pip3 install -r https://raw.githubusercontent.com/GoogleCloudPlatform/slurm-gcp/5.12.1/scripts/requirements.txt
pip3 install -r https://raw.githubusercontent.com/GoogleCloudPlatform/slurm-gcp/change-v5-subnetwork-project-default-to-null/scripts/requirements.txt
```

For more information, see the [description][optdeps] of this module.

[optdeps]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/5.12.1/terraform/slurm_cluster#optional
[optdeps]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null/terraform/slurm_cluster#optional

## Custom Images

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

| Name | Source | Version |
|------|--------|---------|
| <a name="module_slurm_controller_instance"></a> [slurm\_controller\_instance](#module\_slurm\_controller\_instance) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_instance | 5.12.1 |
| <a name="module_slurm_controller_template"></a> [slurm\_controller\_template](#module\_slurm\_controller\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 5.12.1 |
| <a name="module_slurm_controller_instance"></a> [slurm\_controller\_instance](#module\_slurm\_controller\_instance) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_instance | change-v5-subnetwork-project-default-to-null |
| <a name="module_slurm_controller_template"></a> [slurm\_controller\_template](#module\_slurm\_controller\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | change-v5-subnetwork-project-default-to-null |

## Resources

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

module "slurm_controller_instance" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_instance?ref=5.12.1"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_instance?ref=change-v5-subnetwork-project-default-to-null"

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

module "slurm_controller_template" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=5.12.1"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=change-v5-subnetwork-project-default-to-null"

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 @@ -44,7 +44,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/GoogleCloudPlatform/slurm-gcp/tree/5.12.1/terraform/slurm_cluster/modules/slurm_controller_hybrid
[slurm-controller-hybrid]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null/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 @@ -64,15 +64,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/GoogleCloudPlatform/slurm-gcp/blob/5.12.1/scripts/requirements.txt
[requirements.txt]: https://github.com/GoogleCloudPlatform/slurm-gcp/blob/change-v5-subnetwork-project-default-to-null/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/GoogleCloudPlatform/slurm-gcp/blob/5.12.1/docs/hybrid.md
[manual steps]: https://github.com/GoogleCloudPlatform/slurm-gcp/blob/5.12.1/docs/hybrid.md#manual-configurations
[hybrid.md]: https://github.com/GoogleCloudPlatform/slurm-gcp/blob/change-v5-subnetwork-project-default-to-null/docs/hybrid.md
[manual steps]: https://github.com/GoogleCloudPlatform/slurm-gcp/blob/change-v5-subnetwork-project-default-to-null/docs/hybrid.md#manual-configurations

### Example Usage
The hybrid module can be added to a blueprint as follows:
Expand Down Expand Up @@ -152,10 +152,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/GoogleCloudPlatform/slurm-gcp/tree/5.12.1
[slurm-gcp]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null
[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/GoogleCloudPlatform/slurm-gcp/tree/5.12.1/packer
[packer templates]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null/packer

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

| Name | Source | Version |
|------|--------|---------|
| <a name="module_slurm_controller_instance"></a> [slurm\_controller\_instance](#module\_slurm\_controller\_instance) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_hybrid | 5.12.1 |
| <a name="module_slurm_controller_instance"></a> [slurm\_controller\_instance](#module\_slurm\_controller\_instance) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_hybrid | change-v5-subnetwork-project-default-to-null |

## 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/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_hybrid?ref=5.12.1"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_controller_hybrid?ref=change-v5-subnetwork-project-default-to-null"

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 @@ -10,9 +10,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/GoogleCloudPlatform/slurm-gcp/tree/5.12.1
[slurm\_login\_instance]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/5.12.1/terraform/slurm_cluster/modules/slurm_login_instance
[slurm\_instance\_template]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/5.12.1/terraform/slurm_cluster/modules/slurm_instance_template
[SchedMD/slurm-gcp]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null
[slurm\_login\_instance]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null/terraform/slurm_cluster/modules/slurm_login_instance
[slurm\_instance\_template]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null/terraform/slurm_cluster/modules/slurm_instance_template

### Example

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

[slurm-on-gcp]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/5.12.1
[slurm-gcp-readme]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/5.12.1#slurm-on-google-cloud-platform
[slurm-on-gcp]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null
[slurm-gcp-readme]: https://github.com/GoogleCloudPlatform/slurm-gcp/tree/change-v5-subnetwork-project-default-to-null#slurm-on-google-cloud-platform

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

| Name | Source | Version |
|------|--------|---------|
| <a name="module_slurm_login_instance"></a> [slurm\_login\_instance](#module\_slurm\_login\_instance) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_login_instance | 5.12.1 |
| <a name="module_slurm_login_template"></a> [slurm\_login\_template](#module\_slurm\_login\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | 5.12.1 |
| <a name="module_slurm_login_instance"></a> [slurm\_login\_instance](#module\_slurm\_login\_instance) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_login_instance | change-v5-subnetwork-project-default-to-null |
| <a name="module_slurm_login_template"></a> [slurm\_login\_template](#module\_slurm\_login\_template) | github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template | change-v5-subnetwork-project-default-to-null |

## Resources

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

module "slurm_login_template" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=5.12.1"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_instance_template?ref=change-v5-subnetwork-project-default-to-null"

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

module "slurm_login_instance" {
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_login_instance?ref=5.12.1"
source = "github.com/GoogleCloudPlatform/slurm-gcp.git//terraform/slurm_cluster/modules/slurm_login_instance?ref=change-v5-subnetwork-project-default-to-null"

access_config = local.access_config
slurm_cluster_name = local.slurm_cluster_name
Expand Down
Loading

0 comments on commit 0ce4230

Please sign in to comment.