Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
athornton merged 1 commit into from
Apr 4, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion environment/deployments/science-platform/env/dev.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,4 @@ activate_apis = [
]

# Increase this number to force Terraform to update the dev environment.
# Serial: 31
# Serial: 32
2 changes: 1 addition & 1 deletion environment/deployments/science-platform/netapp_volumes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
6 changes: 4 additions & 2 deletions modules/netapp_volumes/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
Loading