Merge pull request hashicorp#58 from hashicorp/f-bump-consul-version

Bump Consul to 1.2.0
tuannvm · Jul 16, 2018 · ed167bf · ed167bf
2 parents 79be486 + aaf511d
commit ed167bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/operations/provision-vault/best-practices/terraform-aws/terraform.auto.tfvars b/operations/provision-vault/best-practices/terraform-aws/terraform.auto.tfvars
@@ -15,7 +15,7 @@
 # bastion_servers        = 1 # Number of bastion hosts to provision across public subnets, defaults to public subnet count.
 # bastion_instance       = "t2.micro"
 # bastion_release        = "0.1.0" # Release version tag (e.g. 0.1.0, 0.1.0-rc1, 0.1.0-beta1, 0.1.0-dev1)
-# bastion_consul_version = "1.0.6" # Consul version tag (e.g. 1.0.6 or 1.0.6-ent) - https://releases.hashicorp.com/consul/
+# bastion_consul_version = "1.2.0" # Consul version tag (e.g. 1.2.0 or 1.2.0-ent) - https://releases.hashicorp.com/consul/
 # bastion_vault_version  = "0.10.3" # Vault version tag (e.g. 0.10.3 or 0.10.3-ent) - https://releases.hashicorp.com/vault/
 # bastion_os             = "Ubuntu" # OS (e.g. RHEL, Ubuntu), defaults to RHEL
 # bastion_os_version     = "16.04" # OS Version (e.g. 7.3 for RHEL, 16.04 for Ubuntu), defaults to 7.3
@@ -29,7 +29,7 @@
 # consul_servers    = 3 # Number of Consul servers to provision across public subnets, defaults to public subnet count.
 # consul_instance   = "t2.micro"
 # consul_release    = "0.1.0" # Release version tag (e.g. 0.1.0, 0.1.0-rc1, 0.1.0-beta1, 0.1.0-dev1)
-# consul_version    = "1.0.6" # Consul version tag (e.g. 1.0.6 or 1.0.6-ent) - https://releases.hashicorp.com/consul/
+# consul_version    = "1.2.0" # Consul version tag (e.g. 1.2.0 or 1.2.0-ent) - https://releases.hashicorp.com/consul/
 # consul_os         = "RHEL" # OS (e.g. RHEL, Ubuntu)
 # consul_os_version = "7.3" # OS Version (e.g. 7.3 for RHEL, 16.04 for Ubuntu)
 # consul_image_id   = "" # AMI ID override, defaults to base RHEL AMI

diff --git a/operations/provision-vault/best-practices/terraform-aws/variables.tf b/operations/provision-vault/best-practices/terraform-aws/variables.tf
@@ -27,7 +27,7 @@ variable "nat_count"              { default = 1 }
 variable "bastion_servers"        { default = 1 }
 variable "bastion_instance"       { default = "t2.small" }
 variable "bastion_release"        { default = "0.1.0" }
-variable "bastion_consul_version" { default = "1.0.6" }
+variable "bastion_consul_version" { default = "1.2.0" }
 variable "bastion_vault_version"  { default = "0.10.3" }
 variable "bastion_os"             { default = "RHEL" }
 variable "bastion_os_version"     { default = "7.3" }
@@ -44,7 +44,7 @@ variable "network_tags" {
 variable "consul_servers"    { default = -1 }
 variable "consul_instance"   { default = "t2.small" }
 variable "consul_release"    { default = "0.1.0" }
-variable "consul_version"    { default = "1.0.6" }
+variable "consul_version"    { default = "1.2.0" }
 variable "consul_os"         { default = "RHEL" }
 variable "consul_os_version" { default = "7.3" }
 variable "consul_image_id"   { default = "" }