From 4c00201bb7669bb2691b3fc5d4580cb18b3b7153 Mon Sep 17 00:00:00 2001
From: Timothy Middelkoop <tmiddelkoop@internet2.edu>
Date: Thu, 6 May 2021 10:24:09 -0500
Subject: [PATCH] Basic SLURM running in CLASS-HPC-GCP project

---
 .gitignore                     | 1 +
 slurm-gcp/Makefile             | 6 +++---
 slurm-gcp/example-local.tfvars | 1 +
 slurm-gcp/main.tf              | 8 ++++----
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 slurm-gcp/example-local.tfvars

diff --git a/.gitignore b/.gitignore
index aa4c729..c77ec82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ terraform.tfstate.backup
 .terraform.lock.hcl
 credentials.gcp
 local*
+.terraform/
diff --git a/slurm-gcp/Makefile b/slurm-gcp/Makefile
index b49e868..9394a38 100644
--- a/slurm-gcp/Makefile
+++ b/slurm-gcp/Makefile
@@ -1,10 +1,10 @@
 .PHONY: plan apply destroy
 
 plan:
-	terraform plan -var-file=basic.tfvars -out terraform.tfplan
+	terraform plan -var-file=basic.tfvars -var-file=local.tfvars -out terraform.tfplan
 
 apply:
-	terraform apply -var-file=basic.tfvars -auto-approve
+	terraform apply -var-file=basic.tfvars -var-file=local.tfvars -auto-approve
 
 destroy:
-	terraform destroy -var-file=basic.tfvars -auto-approve
+	terraform destroy -var-file=basic.tfvars -var-file=local.tfvars -auto-approve
diff --git a/slurm-gcp/example-local.tfvars b/slurm-gcp/example-local.tfvars
new file mode 100644
index 0000000..0ce4d7f
--- /dev/null
+++ b/slurm-gcp/example-local.tfvars
@@ -0,0 +1 @@
+project      = "<project>"
diff --git a/slurm-gcp/main.tf b/slurm-gcp/main.tf
index 0a0178f..fca68bb 100644
--- a/slurm-gcp/main.tf
+++ b/slurm-gcp/main.tf
@@ -24,7 +24,7 @@ provider "google" {
 }
 
 module "slurm_cluster_network" {
-  source = "../../modules/network"
+  source = "../../slurm-gcp/tf/modules/network"
 
   cluster_name                  = var.cluster_name
   disable_login_public_ips      = var.disable_login_public_ips
@@ -40,7 +40,7 @@ module "slurm_cluster_network" {
 }
 
 module "slurm_cluster_controller" {
-  source = "../../modules/controller"
+  source = "../../slurm-gcp/tf/modules/controller"
 
   boot_disk_size                = var.controller_disk_size_gb
   boot_disk_type                = var.controller_disk_type
@@ -74,7 +74,7 @@ module "slurm_cluster_controller" {
 }
 
 module "slurm_cluster_login" {
-  source = "../../modules/login"
+  source = "../../slurm-gcp/tf/modules/login"
 
   boot_disk_size            = var.login_disk_size_gb
   boot_disk_type            = var.login_disk_type
@@ -100,7 +100,7 @@ module "slurm_cluster_login" {
 }
 
 module "slurm_cluster_compute" {
-  source = "../../modules/compute"
+  source = "../../slurm-gcp/tf/modules/compute"
 
   cluster_name               = var.cluster_name
   controller_name            = module.slurm_cluster_controller.controller_node_name