diff --git a/tp-cloud/terraform/environments/dev/main.tf b/tp-cloud/terraform/environments/dev/main.tf index 9c9a9ea..911d786 100644 --- a/tp-cloud/terraform/environments/dev/main.tf +++ b/tp-cloud/terraform/environments/dev/main.tf @@ -10,12 +10,8 @@ terraform { provider "google" { project = var.projet_name region = var.region - zone = var.zone } -# ------------------------- -# MODULE NETWORK -# ------------------------- module "network" { source = "../../modules/network" @@ -23,14 +19,11 @@ module "network" { region = var.region } -# ------------------------- -# MODULE COMPUTE -# ------------------------- module "compute" { source = "../../modules/compute" - projet_name = var.projet_name - zone = var.zone + projet_name = var.projet_name + zone = "europe-west9-a" instance_type = var.instance_type os_login = var.os_login diff --git a/tp-cloud/terraform/environments/dev/variables.tf b/tp-cloud/terraform/environments/dev/variables.tf index 76c828e..b190ba5 100644 --- a/tp-cloud/terraform/environments/dev/variables.tf +++ b/tp-cloud/terraform/environments/dev/variables.tf @@ -8,12 +8,17 @@ variable "region" { default = "europe-west9" } -variable "zone" { - type = string - default = "europe-west9-b" -} - variable "ssh_source_ranges" { type = list(string) default = ["0.0.0.0/0"] } + +variable "instance_type" { + type = string + default = "e2-small" +} + +variable "os_login" { + type = bool + default = true +} \ No newline at end of file diff --git a/tp-cloud/terraform/modules/network/outputs.tf b/tp-cloud/terraform/modules/network/outputs.tf index b2b15a7..018005a 100644 --- a/tp-cloud/terraform/modules/network/outputs.tf +++ b/tp-cloud/terraform/modules/network/outputs.tf @@ -1,11 +1,15 @@ -output "vpc_id" { - value = google_compute_network.vpc.id +output "frontend_subnet_id" { + value = google_compute_subnetwork.frontend.id } -output "subnet_ids" { - value = { - frontend = google_compute_subnetwork.frontend.id - backend = google_compute_subnetwork.backend.id - database = google_compute_subnetwork.database.id - } +output "backend_subnet_id" { + value = google_compute_subnetwork.backend.id } + +output "database_subnet_id" { + value = google_compute_subnetwork.database.id +} + +output "vpc_id" { + value = google_compute_network.vpc.id +} \ No newline at end of file