diff --git a/meta/domain-infra/apps.tf b/meta/domain-infra/apps.tf index 4d15716..7d11117 100644 --- a/meta/domain-infra/apps.tf +++ b/meta/domain-infra/apps.tf @@ -63,13 +63,13 @@ locals { volume = merge(local.global-volume, lookup(lookup(var.api, "storage", {}), "volume", {})) }) }) - okd = merge({"cluster-admin" = true}, local.global,{ for k, v in var.okd : k => v if !contains(["enable","storage","backups"],k) },{ + okd = merge(local.global,{ for k, v in var.okd : k => v if !contains(["enable","storage","backups"],k) },{ backups = merge(local.global-backups, lookup(var.okd, "backups", {})) storage = merge({ for k, v in lookup(var.okd, "storage", {}) : k => v if !contains(["volume"],k) }, { volume = merge(local.global-volume, lookup(lookup(var.okd, "storage", {}), "volume", {})) }) }) - gramo = merge({"cluster-admin" = true}, local.global,{ for k, v in var.gramo : k => v if !contains(["enable","storage","backups"],k) },{ + gramo = merge(local.global,{ for k, v in var.gramo : k => v if !contains(["enable","storage","backups"],k) },{ backups = merge(local.global-backups, lookup(var.gramo, "backups", {})) storage = merge({ for k, v in lookup(var.gramo, "storage", {}) : k => v if !contains(["volume"],k) }, { volume = merge(local.global-volume, lookup(lookup(var.gramo, "storage", {}), "volume", {}))