Skip to content

Commit a53abdd

Browse files
bensojonabensojona
authored
Merge pull request hashicorp#61 from hashicorp/f-update-versions
Update versions
2 parents 4fd5ff1 + c3d35de commit a53abdd

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

‎infrastructure-as-code/hashistack/best-practices/terraform-aws/terraform.auto.tfvars

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
# bastion_servers = 1 # Number of bastion hosts to provision across public subnets, defaults to public subnet count.
1616
# bastion_instance = "t2.micro"
1717
# 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)
18-
# bastion_consul_version = "1.2.0" # Consul version tag (e.g. 1.2.0 or 1.2.0-ent) - https://releases.hashicorp.com/consul/
19-
# bastion_vault_version = "0.10.3" # Vault version tag (e.g. 0.10.3 or 0.10.3-ent) - https://releases.hashicorp.com/vault/
20-
# bastion_nomad_version = "0.8.4" # Nomad version tag (e.g. 0.8.4 or 0.8.4-ent) - https://releases.hashicorp.com/nomad/
18+
# bastion_consul_version = "1.2.3" # Consul version tag (e.g. 1.2.3 or 1.2.3-ent) - https://releases.hashicorp.com/consul/
19+
# bastion_vault_version = "0.11.3" # Vault version tag (e.g. 0.11.3 or 0.11.3-ent) - https://releases.hashicorp.com/vault/
20+
# bastion_nomad_version = "0.8.6" # Nomad version tag (e.g. 0.8.6 or 0.8.6-ent) - https://releases.hashicorp.com/nomad/
2121
# bastion_os = "Ubuntu" # OS (e.g. RHEL, Ubuntu), defaults to RHEL
2222
# bastion_os_version = "16.04" # OS Version (e.g. 7.3 for RHEL, 16.04 for Ubuntu), defaults to 7.3
2323
# bastion_image_id = "" # AMI ID override, defaults to base RHEL AMI
@@ -30,9 +30,9 @@
3030
# hashistack_servers = 3 # Number of Nomad server nodes to provision across public subnets, defaults to public subnet count.
3131
# hashistack_instance = "t2.micro"
3232
# hashistack_release = "0.1.0" # Release version tag (e.g. 0.1.0, 0.1.0-rc1, 0.1.0-beta1, 0.1.0-dev1)
33-
# hashistack_consul_version = "1.2.0" # Consul version tag (e.g. 1.2.0 or 1.2.0-ent) - https://releases.hashicorp.com/consul/
34-
# hashistack_vault_version = "0.10.3" # Version tag (e.g. 0.10.3 or 0.10.3-ent) - https://releases.hashicorp.com/vault/
35-
# hashistack_nomad_version = "0.8.4" # Nomad version tag (e.g. 0.8.4 or 0.8.4-ent) - https://releases.hashicorp.com/nomad/
33+
# hashistack_consul_version = "1.2.3" # Consul version tag (e.g. 1.2.3 or 1.2.3-ent) - https://releases.hashicorp.com/consul/
34+
# hashistack_vault_version = "0.11.3" # Version tag (e.g. 0.11.3 or 0.11.3-ent) - https://releases.hashicorp.com/vault/
35+
# hashistack_nomad_version = "0.8.6" # Nomad version tag (e.g. 0.8.6 or 0.8.6-ent) - https://releases.hashicorp.com/nomad/
3636
# hashistack_os = "RHEL" # OS (e.g. RHEL, Ubuntu)
3737
# hashistack_os_version = "7.3" # OS Version (e.g. 7.3 for RHEL, 16.04 for Ubuntu)
3838
# hashistack_image_id = "" # AMI ID override, defaults to base RHEL AMI

‎infrastructure-as-code/hashistack/best-practices/terraform-aws/variables.tf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ variable "nat_count" { default = 1 }
2727
variable "bastion_servers" { default = 1 }
2828
variable "bastion_instance" { default = "t2.small" }
2929
variable "bastion_release" { default = "0.1.0" }
30-
variable "bastion_consul_version" { default = "1.2.0" }
31-
variable "bastion_vault_version" { default = "0.10.3" }
32-
variable "bastion_nomad_version" { default = "0.8.4" }
30+
variable "bastion_consul_version" { default = "1.2.3" }
31+
variable "bastion_vault_version" { default = "0.11.3" }
32+
variable "bastion_nomad_version" { default = "0.8.6" }
3333
variable "bastion_os" { default = "RHEL" }
3434
variable "bastion_os_version" { default = "7.3" }
3535
variable "bastion_image_id" { default = "" }
@@ -45,9 +45,9 @@ variable "network_tags" {
4545
variable "hashistack_servers" { default = -1 }
4646
variable "hashistack_instance" { default = "t2.small" }
4747
variable "hashistack_release" { default = "0.1.0" }
48-
variable "hashistack_consul_version" { default = "1.2.0" }
49-
variable "hashistack_vault_version" { default = "0.10.3" }
50-
variable "hashistack_nomad_version" { default = "0.8.4" }
48+
variable "hashistack_consul_version" { default = "1.2.3" }
49+
variable "hashistack_vault_version" { default = "0.11.3" }
50+
variable "hashistack_nomad_version" { default = "0.8.6" }
5151
variable "hashistack_os" { default = "RHEL" }
5252
variable "hashistack_os_version" { default = "7.3" }
5353
variable "hashistack_image_id" { default = "" }

‎infrastructure-as-code/hashistack/dev/terraform-aws/terraform.auto.tfvars

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
# ---------------------------------------------------------------------------------------------------------------------
2424
# hashistack_servers = 3
2525
# hashistack_instance = "t2.micro"
26-
# hashistack_consul_version = "1.2.0" # Consul Version for runtime install, defaults to 1.2.0
27-
# hashistack_vault_version = "0.10.3" # Vault Version for runtime install, defaults to 0.10.3
28-
# hashistack_nomad_version = "0.8.4" # Nomad Version for runtime install, defaults to 0.8.4
26+
# hashistack_consul_version = "1.2.3" # Consul Version for runtime install, defaults to 1.2.3
27+
# hashistack_vault_version = "0.11.3" # Vault Version for runtime install, defaults to 0.11.3
28+
# hashistack_nomad_version = "0.8.6" # Nomad Version for runtime install, defaults to 0.8.6
2929
# hashistack_consul_url = "" # Consul Enterprise download URL for runtime install, defaults to Consul OSS
3030
# hashistack_vault_url = "" # Vault Enterprise download URL for runtime install, defaults to Vault OSS
3131
# hashistack_nomad_url = "" # Nomad Enterprise download URL for runtime install, defaults to Nomad OSS

‎infrastructure-as-code/hashistack/dev/terraform-aws/variables.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ variable "network_tags" {
3636

3737
variable "hashistack_servers" { default = 1 }
3838
variable "hashistack_instance" { default = "t2.micro" }
39-
variable "hashistack_consul_version" { default = "1.2.0" }
40-
variable "hashistack_vault_version" { default = "0.10.3" }
41-
variable "hashistack_nomad_version" { default = "0.8.4" }
39+
variable "hashistack_consul_version" { default = "1.2.3" }
40+
variable "hashistack_vault_version" { default = "0.11.3" }
41+
variable "hashistack_nomad_version" { default = "0.8.6" }
4242
variable "hashistack_consul_url" { default = "" }
4343
variable "hashistack_vault_url" { default = "" }
4444
variable "hashistack_nomad_url" { default = "" }

‎infrastructure-as-code/hashistack/dev/vagrant-local/Vagrantfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,23 @@ nomad_host_port = ENV['NOMAD_HOST_PORT'] || 4646
1111
base_box = ENV['BASE_BOX'] || "bento/ubuntu-16.04"
1212

1313
# Consul variables
14-
consul_version = ENV['CONSUL_VERSION'] || "1.2.0"
14+
consul_version = ENV['CONSUL_VERSION'] || "1.2.3"
1515
consul_ent_url = ENV['CONSUL_ENT_URL']
1616
consul_group = "consul"
1717
consul_user = "consul"
1818
consul_comment = "Consul"
1919
consul_home = "/srv/consul"
2020

2121
# Vault variables
22-
vault_version = ENV['VAULT_VERSION'] || "0.10.3"
22+
vault_version = ENV['VAULT_VERSION'] || "0.11.3"
2323
vault_ent_url = ENV['VAULT_ENT_URL']
2424
vault_group = "vault"
2525
vault_user = "vault"
2626
vault_comment = "Vault"
2727
vault_home = "/srv/vault"
2828

2929
# Nomad variables
30-
nomad_version = ENV['NOMAD_VERSION'] || "0.8.4"
30+
nomad_version = ENV['NOMAD_VERSION'] || "0.8.6"
3131
nomad_ent_url = ENV['NOMAD_ENT_URL']
3232
nomad_group = "root"
3333
nomad_user = "root"

‎infrastructure-as-code/hashistack/quick-start/terraform-aws/terraform.auto.tfvars

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
# ---------------------------------------------------------------------------------------------------------------------
2525
# hashistack_servers = 3 # Number of HashiStack servers, defaults to subnet count
2626
# hashistack_instance = "t2.micro"
27-
# hashistack_consul_version = "1.2.0" # Consul Version for runtime install, defaults to 1.2.0
28-
# hashistack_vault_version = "0.10.3" # Vault Version for runtime install, defaults to 0.10.3
29-
# hashistack_nomad_version = "0.8.4" # Nomad Version for runtime install, defaults to 0.8.4
27+
# hashistack_consul_version = "1.2.3" # Consul Version for runtime install, defaults to 1.2.3
28+
# hashistack_vault_version = "0.11.3" # Vault Version for runtime install, defaults to 0.11.3
29+
# hashistack_nomad_version = "0.8.6" # Nomad Version for runtime install, defaults to 0.8.6
3030
# hashistack_consul_url = "" # Consul Enterprise download URL for runtime install, defaults to Consul OSS
3131
# hashistack_vault_url = "" # Vault Enterprise download URL for runtime install, defaults to Vault OSS
3232
# hashistack_nomad_url = "" # Nomad Enterprise download URL for runtime install, defaults to Nomad OSS

‎infrastructure-as-code/hashistack/quick-start/terraform-aws/variables.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ variable "network_tags" {
3737
# ---------------------------------------------------------------------------------------------------------------------
3838
variable "hashistack_servers" { default = -1 }
3939
variable "hashistack_instance" { default = "t2.micro" }
40-
variable "hashistack_consul_version" { default = "1.2.0" }
41-
variable "hashistack_vault_version" { default = "0.10.3" }
42-
variable "hashistack_nomad_version" { default = "0.8.4" }
40+
variable "hashistack_consul_version" { default = "1.2.3" }
41+
variable "hashistack_vault_version" { default = "0.11.3" }
42+
variable "hashistack_nomad_version" { default = "0.8.6" }
4343
variable "hashistack_consul_url" { default = "" }
4444
variable "hashistack_vault_url" { default = "" }
4545
variable "hashistack_nomad_url" { default = "" }

0 commit comments

Comments
 (0)