Merge pull request #3 from mojaloop/add-zone-count

Add zone count
mojaloop · Jul 26, 2022 · 7f75410 · 7f75410
2 parents 6fda44d + 7459200
commit 7f75410
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/main.tf b/main.tf
@@ -1,6 +1,7 @@
 locals {
-  all_pub_subnets  = merge({"management" = {env = "management", az = data.aws_availability_zones.available.names[0], cidr_block_index = 0}}, {for pair in setproduct(var.environments, data.aws_availability_zones.available.names) : "${pair[0]}-${pair[1]}" => {env = pair[0], az  = pair[1], cidr_block_index = 1 + index(data.aws_availability_zones.available.names, pair[1]) + (var.cidr_block_index[pair[0]]) * length(data.aws_availability_zones.available.names)}})
-  all_priv_subnets = {for pair in setproduct(var.environments, data.aws_availability_zones.available.names) : "${pair[0]}-${pair[1]}" => {env = pair[0], az  = pair[1], cidr_block_index = index(data.aws_availability_zones.available.names, pair[1]) + (var.cidr_block_index[pair[0]]) * length(data.aws_availability_zones.available.names)}}
+  availability_zones = slice(data.aws_availability_zones.available.names, 0, min(var.max_number_availability_zones, length(data.aws_availability_zones.available.names)))
+  all_pub_subnets  = merge({"management" = {env = "management", az = local.availability_zones[0], cidr_block_index = 0}}, {for pair in setproduct(var.environments, local.availability_zones) : "${pair[0]}-${pair[1]}" => {env = pair[0], az  = pair[1], cidr_block_index = 1 + index(local.availability_zones, pair[1]) + (var.cidr_block_index[pair[0]]) * length(local.availability_zones)}})
+  all_priv_subnets = {for pair in setproduct(var.environments, local.availability_zones) : "${pair[0]}-${pair[1]}" => {env = pair[0], az  = pair[1], cidr_block_index = index(local.availability_zones, pair[1]) + (var.cidr_block_index[pair[0]]) * length(local.availability_zones)}}
 }
 
 module "ubuntu-bionic-ami" {

diff --git a/output.tf b/output.tf
@@ -188,4 +188,19 @@ output "ses_pw" {
   description = "ses pw"
   value       = var.smtp_server_enable ? module.ses[0].ses_smtp_password : "pass"
   sensitive   = true
+}
+
+output "availability_zones" {
+  description = "azs used in tenancy"
+  value       = local.availability_zones
+}
+
+output "natgw_public_ip" {
+  description = "natgw public ip"
+  value       = module.public_subnets.ngw_public_ip
+}
+
+output "natgw_private_ip" {
+  description = "natgw private ip"
+  value       = module.public_subnets.ngw_private_ip
 }
diff --git a/variables.tf b/variables.tf
@@ -186,4 +186,10 @@ variable "gitlab_version" {
   type        = string
   description = "gitlab_version"
   default = "14.8.2"
+}
+
+variable "max_number_availability_zones" {
+  type = number
+  description = "max number of azs to support"
+  default = 1
 }