Allow use of 3 availability zones (#23)

* Allow use of 3 availability zones after hashicorp/terraform-provider-aws#9398 * Update module documentation * Move zone_awareness out of zone_awareness_config * Add an extra az to th tfvars * Revert "Add an extra az to th tfvars" This reverts commit cdc0d26.
cloudposse · Jul 28, 2019 · 650d5c9 · 650d5c9
1 parent 5edffee
commit 650d5c9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -110,6 +110,7 @@ Available targets:
 | allowed_cidr_blocks | List of CIDR blocks to be allowed to connect to the cluster | list(string) | `<list>` | no |
 | attributes | Additional attributes (e.g. `1`) | list(string) | `<list>` | no |
 | automated_snapshot_start_hour | Hour at which automated snapshots are taken, in UTC | number | `0` | no |
+| availability_zone_count | Number of Availability Zones for the domain to use. | number | `2` | no |
 | create_iam_service_linked_role | Whether to create `AWSServiceRoleForAmazonElasticsearchService` service-linked role. Set it to `false` if you already have an ElasticSearch cluster created in the AWS account and AWSServiceRoleForAmazonElasticsearchService already exists. See https://github.com/terraform-providers/terraform-provider-aws/issues/5218 for more info | bool | `true` | no |
 | dedicated_master_count | Number of dedicated master nodes in the cluster | number | `0` | no |
 | dedicated_master_enabled | Indicates whether dedicated master nodes are enabled for the cluster | bool | `false` | no |

diff --git a/docs/terraform.md b/docs/terraform.md
@@ -6,6 +6,7 @@
 | allowed_cidr_blocks | List of CIDR blocks to be allowed to connect to the cluster | list(string) | `<list>` | no |
 | attributes | Additional attributes (e.g. `1`) | list(string) | `<list>` | no |
 | automated_snapshot_start_hour | Hour at which automated snapshots are taken, in UTC | number | `0` | no |
+| availability_zone_count | Number of Availability Zones for the domain to use. | number | `2` | no |
 | create_iam_service_linked_role | Whether to create `AWSServiceRoleForAmazonElasticsearchService` service-linked role. Set it to `false` if you already have an ElasticSearch cluster created in the AWS account and AWSServiceRoleForAmazonElasticsearchService already exists. See https://github.com/terraform-providers/terraform-provider-aws/issues/5218 for more info | bool | `true` | no |
 | dedicated_master_count | Number of dedicated master nodes in the cluster | number | `0` | no |
 | dedicated_master_enabled | Indicates whether dedicated master nodes are enabled for the cluster | bool | `false` | no |

diff --git a/main.tf b/main.tf
@@ -125,6 +125,10 @@ resource "aws_elasticsearch_domain" "default" {
     dedicated_master_count   = var.dedicated_master_count
     dedicated_master_type    = var.dedicated_master_type
     zone_awareness_enabled   = var.zone_awareness_enabled
+
+    zone_awareness_config {
+      availability_zone_count = var.availability_zone_count
+    }
   }
 
   node_to_node_encryption {

diff --git a/variables.tf b/variables.tf
@@ -109,6 +109,12 @@ variable "zone_awareness_enabled" {
   description = "Enable zone awareness for Elasticsearch cluster"
 }
 
+variable "availability_zone_count" {
+  type        = number
+  default     = 2
+  description = "Number of Availability Zones for the domain to use."
+}
+
 variable "ebs_volume_size" {
   type        = number
   description = "EBS volumes for data storage in GB"