Change name of simple-instance to vm-instance

community/examples/omnia-cluster.yaml

@@ -75,7 +75,7 @@ deployment_groups:
       - $(omnia.setup_omnia_node_runner)
 
   ## Compute
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: manager
     use:
@@ -86,7 +86,7 @@ deployment_groups:
       name_prefix: omnia-manager
       machine_type: n2-standard-4
 
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: compute
     use:

modules/README.md

@@ -13,11 +13,11 @@ module are listed in more detail below.
 
 Compute
 
-* **[simple-instance]** ![core-badge] : Creates one or more simple VM instances.
+* **[vm-instance]** ![core-badge] : Creates one or more simple VM instances.
 * **[SchedMD-slurm-on-gcp-partition]** ![community-badge] : Creates a partition
   to be used by a [slurm-controller][schedmd-slurm-on-gcp-controller].
 
-[simple-instance]: compute/simple-instance/README.md
+[vm-instance]: compute/vm-instance/README.md
 [schedmd-slurm-on-gcp-partition]: ../community/modules/compute/SchedMD-slurm-on-gcp-partition/README.md
 
 Database
@@ -216,7 +216,7 @@ modules:
   kind: terraform
   id: network1
 
-- resource: modules/compute/simple-instance
+- resource: modules/compute/vm-instance
   kind: terraform
   id: workstation
   use: [network1]
@@ -228,7 +228,7 @@ In this snippet, the simple instance, `workstation`, uses the outputs of vpc
 `network1`.
 
 In this case both `network_self_link` and `subnetwork_self_link` in the
-[`workstation` settings](compute/simple-instance/README.md#Inputs) will be set
+[`workstation` settings](compute/vm-instance/README.md#Inputs) will be set
 to `$(network1.network_self_link)` and `$(network1.subnetwork_self_link)` which
 refer to the [`network1` outputs](network/vpc/README#Outputs)
 of the same names.
@@ -325,7 +325,7 @@ Below we show a few of the modules and their roles (as parent folders).
 ```text
 modules/
 ├── compute
-│   └── simple-instance
+│   └── vm-instance
 ├── file-system
 │   └── filestore
 ├── network

modules/compute/simple-instance/README.md → modules/compute/vm-instance/README.md

@@ -6,7 +6,7 @@ This module creates one or more simple
 ### Example
 
 ```yaml
-- source: ./modules/compute/simple-instance
+- source: ./modules/compute/vm-instance
   kind: terraform
   id: compute
   settings:

modules/compute/simple-instance/main.tf → modules/compute/vm-instance/main.tf

@@ -54,7 +54,7 @@ resource "google_compute_disk" "boot_disk" {
 
 resource "google_compute_resource_policy" "placement_policy" {
   count = var.placement_policy != null ? 1 : 0
-  name  = "${local.resource_prefix}-simple-instance-placement"
+  name  = "${local.resource_prefix}-vm-instance-placement"
   group_placement_policy {
     vm_count                  = var.placement_policy.vm_count
     availability_domain_count = var.placement_policy.availability_domain_count

modules/scripts/startup-script/README.md

@@ -83,7 +83,7 @@ sudo journalctl -u google-startup-scripts.service
           tar zxvf /tmp/$1 -C /
         args: "bar.tgz 'Expanding file'"
 
-- source: ./modules/compute/simple-instance
+- source: ./modules/compute/vm-instance
   kind: terraform
   id: compute-cluster
   settings:

tools/cloud-build/daily-tests/blueprints/lustre-with-new-vpc.yaml

@@ -51,8 +51,8 @@ deployment_groups:
       subnetwork_self_link: $(network1.subnetwork_self_link)
       subnetwork_address: $(network1.subnetwork_address)
 
-  # Create a separate workstation to catch regressions in simple-instance
-  - source: ./modules/compute/simple-instance
+  # Create a separate workstation to catch regressions in vm-instance
+  - source: ./modules/compute/vm-instance
     kind: terraform
     id: workstation
     use:

tools/cloud-build/daily-tests/blueprints/monitoring.yaml

@@ -53,7 +53,7 @@ deployment_groups:
       - $(homefs.install_nfs_client_runner)
       - $(homefs.mount_runner)
 
-  - source: ./modules/compute/simple-instance
+  - source: ./modules/compute/vm-instance
     kind: terraform
     id: workstation
     use:

tools/validate_configs/test_configs/2filestore-4instances.yaml

@@ -64,7 +64,7 @@ deployment_groups:
         source: "modules/startup-script/examples/mount.yaml"
         destination: "mount.yaml"
 
-  - source: ./modules/compute/simple-instance
+  - source: ./modules/compute/vm-instance
     kind: terraform
     id: license-server-1
     use: [network]
@@ -74,7 +74,7 @@ deployment_groups:
       labels:
         ghpc_role: license
 
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: license-server-2
     use: [network]
@@ -84,7 +84,7 @@ deployment_groups:
       labels:
         ghpc_role: license
 
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: head-node
     use:
@@ -99,7 +99,7 @@ deployment_groups:
       metadata:
         startup-script: $(startup.startup_script)
 
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: compute
     use:

tools/validate_configs/test_configs/README.md

@@ -29,7 +29,7 @@ one manager node and eight compute nodes that share a `/home` mounted filestore
 instance. The pre-existing default VPC network is used.
 
 **instance_with_startup.yaml**: Creates a simple cluster with one
-simple-instance and filestore using the startup-script module to setup and
+vm-instance and filestore using the startup-script module to setup and
 mount the filestore instance.
 
 **packer.yaml**: Creates a network for Packer to create a custom VM image.

tools/validate_configs/test_configs/complex-data.yaml

@@ -74,7 +74,7 @@ deployment_groups:
         source: "modules/startup-script/examples/mount.yaml"
         destination: mount.yaml
 
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: license-server-1
     use: [network]

tools/validate_configs/test_configs/gpu.yaml

@@ -32,7 +32,7 @@ deployment_groups:
     kind: terraform
     id: network1
 
-  - source: ./modules/compute/simple-instance
+  - source: ./modules/compute/vm-instance
     kind: terraform
     id: workstation
     use:

tools/validate_configs/test_configs/hpc-cluster-simple.yaml

@@ -53,7 +53,7 @@ deployment_groups:
         source: "modules/startup-script/examples/mount.yaml"
         destination: mount.yaml
 
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: workstation
     use:

tools/validate_configs/test_configs/instance-with-startup.yaml

@@ -51,7 +51,7 @@ deployment_groups:
         source: "modules/startup-script/examples/mount.yaml"
         destination: "tmp.sh"
 
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: workstation
     use:

tools/validate_configs/test_configs/rocky-linux.yaml

@@ -101,7 +101,7 @@ deployment_groups:
         content: $(spack.startup_script)
         destination: "/apps/spack-install.sh"
 
-  - source: ./modules/compute/simple-instance
+  - source: ./modules/compute/vm-instance
     kind: terraform
     id: instance
     use: [network1, startup, nfs, appsfs]

tools/validate_configs/test_configs/simple-startup.yaml

@@ -48,7 +48,7 @@ deployment_groups:
           tar zxvf /tmp/$1 -C /
         args: "foo.tgz 'Expanding the file'"
 
-  - source: ./modules/compute/simple-instance
+  - source: ./modules/compute/vm-instance
     kind: terraform
     id: instance
     use: [network1, startup]

tools/validate_configs/test_configs/slurm-two-partitions-workstation.yaml

@@ -51,7 +51,7 @@ deployment_groups:
         source: "modules/startup-script/examples/mount.yaml"
         destination: "tmp.sh"
 
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: workstation
     use:

tools/validate_configs/test_configs/spack-buildcache.yaml

@@ -80,7 +80,7 @@ deployment_groups:
         destination: shutdown.sh
         content: shutdown -h
 
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: spack-build
     use:

tools/validate_configs/test_configs/startup-options.yaml

@@ -48,7 +48,7 @@ deployment_groups:
           tar zxvf /tmp/$1 -C /
         args: "foo.tgz 'Expanding the file'"
 
-  - source: ./modules/compute/simple-instance
+  - source: ./modules/compute/vm-instance
     kind: terraform
     id: instance-explicit-startup
     use: [network1]
@@ -57,15 +57,15 @@ deployment_groups:
       machine_type: e2-standard-4
       startup_script: $(startup.startup_script)
 
-  - source: ./modules/compute/simple-instance
+  - source: ./modules/compute/vm-instance
     kind: terraform
     id: instance-no-startup
     use: [network1]
     settings:
       name_prefix: no-startup
       machine_type: e2-standard-4
 
-  - source: ./modules/compute/simple-instance
+  - source: ./modules/compute/vm-instance
     kind: terraform
     id: instance-use-startup
     use: [network1, startup]
@@ -74,7 +74,7 @@ deployment_groups:
       machine_type: e2-standard-4
       startup_script: $(startup.startup_script)
 
-  - source: ./modules/compute/simple-instance
+  - source: ./modules/compute/vm-instance
     kind: terraform
     id: instance-metadata-startup
     use: [network1]

tools/validate_configs/test_configs/test_outputs.yaml

@@ -25,7 +25,7 @@ vars:
 deployment_groups:
 - group: primary
   modules:
-  - source: modules/compute/simple-instance
+  - source: modules/compute/vm-instance
     kind: terraform
     id: instance
     outputs: