[tf] set default num_validators_in_genesis same as num_validators

sherry-x · bors-libra · commit 5ad239bcc36f · 2020-03-26T20:11:44.000Z
Closes: diem#3141 Approved by: mgorven
diff --git a/terraform/validators.tf b/terraform/validators.tf
@@ -203,7 +203,7 @@ data "template_file" "ecs_task_definition" {
     cfg_listen_addr               = var.validator_use_public_ip == true ? element(aws_instance.validator.*.public_ip, count.index) : element(aws_instance.validator.*.private_ip, count.index)
     cfg_node_index                = count.index
     cfg_num_validators            = var.cfg_num_validators_override == 0 ? var.num_validators : var.cfg_num_validators_override
-    cfg_num_validators_in_genesis = var.num_validators_in_genesis
+    cfg_num_validators_in_genesis = var.num_validators_in_genesis == 0? var.num_validators : var.num_validators_in_genesis
     cfg_seed                      = var.config_seed
     cfg_seed_peer_ip              = local.seed_peer_ip
 
diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -56,8 +56,8 @@ variable "num_validators" {
 }
 
 variable "num_validators_in_genesis" {
-  default     = 4
-  description = "Number of validator nodes to include in genesis blob"
+  default     = 0
+  description = "Number of validator nodes to include in genesis blob, 0 will default to using num_validators"
 }
 
 # This allows you to use a override number of validators for config generation

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ variable "num_validators" {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`variable "num_validators_in_genesis" {`
`59`		`- default = 4`
`60`		`- description = "Number of validator nodes to include in genesis blob"`
	`59`	`+ default = 0`
	`60`	`+ description = "Number of validator nodes to include in genesis blob, 0 will default to using num_validators"`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`# This allows you to use a override number of validators for config generation`