give up on too much complexity, add better documentation

Achille Roussel · Achille Roussel · commit bc928afa58b1 · 2016-06-17T17:25:48.000-07:00
diff --git a/defaults/main.tf b/defaults/main.tf
@@ -22,23 +22,6 @@ variable "cidr" {
   description = "The CIDR block to provision for the VPC"
 }
 
-variable "default_availability_zones" {
-  description = "A mapping of the default availability zones for each AWS region"
-
-  default = {
-    us-east-1      = "us-east-1a,us-east-1b,us-east-1c,us-east-1e"
-    us-west-1      = "us-west-1a,us-west-1b"
-    us-west-2      = "us-west-2a,us-west-2b,us-west-2c"
-    eu-west-1      = "eu-west-1a,eu-west-1b,eu-west-1c"
-    eu-central-1   = "eu-central-1a,eu-central-1b"
-    ap-southeast-1 = "ap-southeast-1a,ap-southeast-1b"
-    ap-southeast-2 = "ap-southeast-2a,ap-southeast-2b,ap-southeast-2c"
-    ap-northeast-1 = "ap-northeast-1a,ap-northeast-1c"
-    ap-northeast-2 = "ap-northeast-2a,ap-northeast-2c"
-    sa-east-1      = "sa-east-1a,sa-east-1b,sa-east-1c"
-  }
-}
-
 variable "default_ecs_ami" {
   default = {
     us-east-1      = "ami-5f3ff932"
@@ -72,10 +55,6 @@ variable "default_log_account_ids" {
   }
 }
 
-output "availability_zones" {
-  value = "${lookup(var.default_availability_zones, var.region)}"
-}
-
 output "domain_name_servers" {
   value = "${cidrhost(var.cidr, 2)}"
 }
diff --git a/main.tf b/main.tf
@@ -36,7 +36,7 @@ variable "domain_name_servers" {
 }
 
 variable "region" {
-  description = "the AWS region"
+  description = "the AWS region in which resources are created, you must set the availability_zones variable as well if you define this value to something other than the default"
   default     = "us-west-2"
 }
 
@@ -57,7 +57,7 @@ variable "external_subnets" {
 
 variable "availability_zones" {
   description = "a comma-separated list of availability zones, defaults to all AZ of the region, if set to something other than the defaults, both internal_subnets and external_subnets have to be defined as well"
-  default     = ""
+  default     = "us-west-2a,us-west-2b,us-west-2c"
 }
 
 variable "ecs_instance_type" {
@@ -126,7 +126,7 @@ module "vpc" {
   cidr               = "${var.cidr}"
   internal_subnets   = "${var.internal_subnets}"
   external_subnets   = "${var.external_subnets}"
-  availability_zones = "${coalesce(var.availability_zones, module.defaults.availability_zones)}"
+  availability_zones = "${var.availability_zones}"
   environment        = "${var.environment}"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ variable "domain_name_servers" {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`variable "region" {`
`39`		`- description = "the AWS region"`
	`39`	`+ description = "the AWS region in which resources are created, you must set the availability_zones variable as well if you define this value to something other than the default"`
`40`	`40`	`default = "us-west-2"`
`41`	`41`	`}`
`42`	`42`
`@@ -57,7 +57,7 @@ variable "external_subnets" {`
`57`	`57`
`58`	`58`	`variable "availability_zones" {`
`59`	`59`	`description = "a comma-separated list of availability zones, defaults to all AZ of the region, if set to something other than the defaults, both internal_subnets and external_subnets have to be defined as well"`
`60`		`- default = ""`
	`60`	`+ default = "us-west-2a,us-west-2b,us-west-2c"`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`variable "ecs_instance_type" {`
`@@ -126,7 +126,7 @@ module "vpc" {`
`126`	`126`	`cidr = "${var.cidr}"`
`127`	`127`	`internal_subnets = "${var.internal_subnets}"`
`128`	`128`	`external_subnets = "${var.external_subnets}"`
`129`		`- availability_zones = "${coalesce(var.availability_zones, module.defaults.availability_zones)}"`
	`129`	`+ availability_zones = "${var.availability_zones}"`
`130`	`130`	`environment = "${var.environment}"`
`131`	`131`	`}`
`132`	`132`