v3.2.5

brianshumate · Feb 13, 2020 · 582cbee · 582cbee
1 parent 4056d16
commit 582cbee
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.2.5
+
+- Consul 1.7.0
+- Fix Terraform issue with labels
+- Update documentation
+
 ## 3.2.4
 
 - Vault v1.3.2

diff --git a/red_lion/templates/oss/consul_oss_client_config_1.7.0.hcl b/red_lion/templates/oss/consul_oss_client_config_1.7.0.hcl
@@ -0,0 +1,15 @@
+{
+  "node_id": "${agent_node_id}",
+  "raft_protocol": 3,
+  "acl_datacenter": "arus",
+  "acl_master_token": "b4c0ffee-3b77-04af-36d6-738b697872e6",
+  "acl_default_policy": "allow",
+  "acl_down_policy": "allow",
+  "cert_file": "/etc/ssl/certs/consul-client.crt",
+  "key_file": "/etc/ssl/consul-client.key",
+  "ca_file": "/etc/ssl/certs/ca.pem",
+  "ports": {
+    "http": -1,
+    "https": 8500
+  }
+}
diff --git a/red_lion/templates/oss/consul_oss_server_config_1.7.0.hcl b/red_lion/templates/oss/consul_oss_server_config_1.7.0.hcl
@@ -0,0 +1,22 @@
+{
+  "bootstrap_expect": 3,
+  "datacenter": "${datacenter}",
+  "data_dir": "${data_dir}",
+  "raft_protocol": 3,
+  "acl_datacenter": "arus",
+  "acl_master_token": "b4c0ffee-3b77-04af-36d6-738b697872e6",
+  "acl_default_policy": "allow",
+  "acl_down_policy": "allow",
+  "recursors": [
+    "${recursor1}",
+    "${recursor2}"
+  ],
+  "cert_file": "/etc/ssl/certs/consul-server.crt",
+  "key_file": "/etc/ssl/consul-server.key",
+  "ca_file": "/etc/ssl/certs/ca.pem",
+  "ports": {
+    "http": -1,
+    "https": 8500
+  },
+  "ui": true
+}
diff --git a/vaultron.tf b/vaultron.tf
@@ -17,7 +17,7 @@ variable "vault_version" {
 
 # Set TF_VAR_consul_version to set this
 variable "consul_version" {
-  default = "1.6.3"
+  default = "1.7.0"
 }
 
 # -----------------------------------------------------------------------

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.2.4
+3.2.5