diff --git a/tp-cloud/terraform/environments/dev/main.tf b/tp-cloud/terraform/environments/dev/main.tf index 08a479b..aef3c9e 100644 --- a/tp-cloud/terraform/environments/dev/main.tf +++ b/tp-cloud/terraform/environments/dev/main.tf @@ -2,41 +2,31 @@ terraform { required_providers { google = { source = "hashicorp/google" - version = "~> 6.0" + version = "~> 6.12.0" } } - required_version = ">= 1.0.0" } provider "google" { project = var.projet_name region = var.region - zone = var.zone } module "network" { - source = "../../modules/network" - project = var.projet_name - region = var.region - frontend_cidr = "10.10.1.0/24" - backend_cidr = "10.10.2.0/24" - database_cidr = "10.10.3.0/24" - ssh_source_ranges = var.ssh_source_ranges -} - -module "iam" { - source = "../../modules/iam" - project = var.project + source = "../../modules/network" + project = var.projet_name + region = var.region } module "compute" { - source = "../../modules/compute" - project = var.projet_name - zone = var.zone - instance_type = "e2-small" - frontend_subnet_id = module.network.subnet_ids["frontend"] - backend_subnet_id = module.network.subnet_ids["backend"] - database_subnet_id = module.network.subnet_ids["database"] - os_login = true -} + source = "../../modules/compute" + projet_name = var.projet_name + zone = var.zone + instance_type = var.instance_type + os_login = var.os_login + + frontend_subnet_id = module.network.subnet_ids["frontend"] + backend_subnet_id = module.network.subnet_ids["backend"] + database_subnet_id = module.network.subnet_ids["database"] +} \ No newline at end of file