Merge pull request #591 from lsst/tickets/DM-49593

Explicitly specify project/location for quota rules, try network_self…

Author: athornton

environment/deployments/science-platform/env/dev.tfvars

@@ -142,4 +142,4 @@ activate_apis = [
 ]
 
 # Increase this number to force Terraform to update the dev environment.
-# Serial: 31
+# Serial: 32

environment/deployments/science-platform/netapp_volumes.tf

@@ -54,7 +54,7 @@ module "netapp-volumes" {
     for voldef in var.netapp_definitions : "${voldef.name}" => voldef
   })
   source   = "../../../modules/netapp_volumes"
-  network  = module.project_factory.network_name
+  network  = module.project_factory.network.network_id
   project  = module.project_factory.project_id
   location = var.subnets[0].subnet_region
   labels = {

modules/netapp_volumes/main.tf

@@ -130,7 +130,8 @@ resource "google_netapp_backup_policy" "instance" {
 
 # Disabled if the default quota is not set
 resource "google_netapp_volume_quota_rule" "default_user_quota" {
-
+  project  = var.project
+  location = var.location
   count = var.definition.default_user_quota_mib == null ? 0 : 1
 
   name           = "${var.definition.name}-default-quota"
@@ -148,7 +149,8 @@ resource "google_netapp_volume_quota_rule" "individual_user_quota" {
   for_each = tomap({
     for quota in var.definition.override_user_quotas : "${quota.uid}" => quota
   })
-
+  project  = var.project
+  location = var.location
   depends_on     = [google_netapp_volume.instance]
   type           = "INDIVIDUAL_USER_QUOTA"
   labels         = var.labels