feat: (PSKD-709) Updates for NFS mount

sassoftware · Oct 30, 2024 · cc1aadf · cc1aadf
1 parent 86c9c73
commit cc1aadf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/modules/google_netapp/main.tf b/modules/google_netapp/main.tf
@@ -20,9 +20,7 @@ resource "google_service_networking_connection" "default" {
   service                 = "netapp.servicenetworking.goog"
   reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
 
-  depends_on = [
-    google_compute_global_address.private_ip_alloc
-  ]
+  deletion_policy = "ABANDON"
 }
 
 # Modify the PSA Connection to allow import/export of custom routes
@@ -64,6 +62,7 @@ resource "google_netapp_volume" "netapp-nfs-volume" {
   }
 
   depends_on = [
-    google_netapp_storage_pool.netapp-tf-pool
+    google_netapp_storage_pool.netapp-tf-pool,
+    google_service_networking_connection.default
   ]
 }
diff --git a/vms.tf b/vms.tf
@@ -10,7 +10,7 @@ locals {
   rwx_filestore_path = (var.storage_type == "none"
     ? ""
     : var.storage_type == "ha" && local.storage_type_backend == "filestore" ? "/${google_filestore_instance.rwx[0].file_shares[0].name}"
-    : var.storage_type == "ha" && local.storage_type_backend == "netapp" ? "/${module.google_netapp[0].mountpath}" : "/export"
+    : var.storage_type == "ha" && local.storage_type_backend == "netapp" ? module.google_netapp[0].mountpath : "/export"
   )
   protocol_version = var.storage_type == "ha" && local.storage_type_backend == "netapp" ? split("V", var.netapp_protocols[0])[1] == "4" ? "4.1" : "3" : "3"