diff --git a/terraform/aws/main.tf b/terraform/aws/main.tf index 7b0ba251..2e00a6e2 100644 --- a/terraform/aws/main.tf +++ b/terraform/aws/main.tf @@ -139,7 +139,6 @@ module "drbd_node" { network_domain = var.drbd_network_domain == "" ? var.network_domain : var.drbd_network_domain drbd_count = var.drbd_enabled == true ? 2 : 0 instance_type = var.drbd_instancetype - aws_region = var.aws_region availability_zones = data.aws_availability_zones.available.names os_image = local.drbd_os_image os_owner = local.drbd_os_owner @@ -165,7 +164,6 @@ module "iscsi_server" { name = var.iscsi_name network_domain = var.iscsi_network_domain == "" ? var.network_domain : var.iscsi_network_domain iscsi_count = local.iscsi_enabled == true ? var.iscsi_count : 0 - aws_region = var.aws_region availability_zones = data.aws_availability_zones.available.names subnet_ids = aws_subnet.infra-subnet.*.id os_image = local.iscsi_os_image @@ -186,7 +184,6 @@ module "netweaver_node" { xscs_server_count = local.netweaver_xscs_server_count app_server_count = var.netweaver_enabled ? var.netweaver_app_server_count : 0 instance_type = var.netweaver_instancetype - aws_region = var.aws_region availability_zones = data.aws_availability_zones.available.names os_image = local.netweaver_os_image os_owner = local.netweaver_os_owner @@ -212,7 +209,6 @@ module "hana_node" { network_domain = var.hana_network_domain == "" ? var.network_domain : var.hana_network_domain hana_count = var.hana_count instance_type = var.hana_instancetype - aws_region = var.aws_region availability_zones = data.aws_availability_zones.available.names os_image = local.hana_os_image os_owner = local.hana_os_owner @@ -240,7 +236,6 @@ module "monitoring" { key_name = aws_key_pair.key-pair.key_name security_group_id = local.security_group_id monitoring_srv_ip = local.monitoring_ip - aws_region = var.aws_region availability_zones = data.aws_availability_zones.available.names os_image = local.monitoring_os_image os_owner = local.monitoring_os_owner diff --git a/terraform/aws/modules/drbd_node/variables.tf b/terraform/aws/modules/drbd_node/variables.tf index 505d407c..e95a632a 100644 --- a/terraform/aws/modules/drbd_node/variables.tf +++ b/terraform/aws/modules/drbd_node/variables.tf @@ -24,10 +24,6 @@ variable "instance_type" { default = "t2.large" } -variable "aws_region" { - type = string -} - variable "availability_zones" { type = list(string) description = "Used availability zones" diff --git a/terraform/aws/modules/hana_node/variables.tf b/terraform/aws/modules/hana_node/variables.tf index 08dd0ff4..f70bbbe6 100644 --- a/terraform/aws/modules/hana_node/variables.tf +++ b/terraform/aws/modules/hana_node/variables.tf @@ -22,10 +22,6 @@ variable "instance_type" { default = "r3.8xlarge" } -variable "aws_region" { - type = string -} - variable "availability_zones" { type = list(string) description = "Used availability zones" diff --git a/terraform/aws/modules/iscsi_server/variables.tf b/terraform/aws/modules/iscsi_server/variables.tf index 5c957cff..ed23f80b 100644 --- a/terraform/aws/modules/iscsi_server/variables.tf +++ b/terraform/aws/modules/iscsi_server/variables.tf @@ -2,11 +2,6 @@ variable "common_variables" { description = "Output of the common_variables module" } -variable "aws_region" { - type = string - description = "AWS region where the deployment machines will be created" -} - variable "availability_zones" { type = list(string) description = "Used availability zones" diff --git a/terraform/aws/modules/monitoring/variables.tf b/terraform/aws/modules/monitoring/variables.tf index 7cb5162f..28e279cb 100644 --- a/terraform/aws/modules/monitoring/variables.tf +++ b/terraform/aws/modules/monitoring/variables.tf @@ -40,10 +40,6 @@ variable "monitoring_srv_ip" { default = "" } -variable "aws_region" { - type = string -} - variable "availability_zones" { type = list(string) description = "Used availability zones" diff --git a/terraform/aws/modules/netweaver_node/variables.tf b/terraform/aws/modules/netweaver_node/variables.tf index 7d8cae61..6a06b334 100644 --- a/terraform/aws/modules/netweaver_node/variables.tf +++ b/terraform/aws/modules/netweaver_node/variables.tf @@ -27,10 +27,6 @@ variable "network_domain" { type = string } -variable "aws_region" { - type = string -} - variable "availability_zones" { type = list(string) description = "Used availability zones"