Vault v1.7.2 and Consul v1.9.5

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 3.7.4
+
+- Vault v1.7.2
+- Update documentation
+
+## 3.7.3
+
+- Vault v1.7.1
+- Update documentation
+
 ## 3.7.2
 
 - Require Terraform >= 0.15.0

README.md

@@ -189,9 +189,9 @@ When Vaultron is successfully formed, the output looks like this example.
 [vaultron] [+] Created attachable vaultron-network with subnet 10.10.42.0/24
 [vaultron] [=] Form Vaultron! 
 [vaultron] [i] Terraform has been successfully initialized! 
-[vaultron] [i] Vault OSS version: 1.7.0 
+[vaultron] [i] Vault OSS version: 1.7.2
 [vaultron] [i] Vault flavor: Consul storage backed 
-[vaultron] [i] Consul OSS version: 1.9.4 
+[vaultron] [i] Consul OSS version: 1.9.5 
 [vaultron] [i] Terraform plan: 14 to add, 0 to change, 0 to destroy. 
 [vaultron] [i] Terraform apply complete! resources: 14 added, 0 changed, 0 destroyed. 
 [vaultron] [+] Vaultron formed in 14s.
@@ -331,11 +331,11 @@ $ ./form
 [vaultron] [+] Created attachable vaultron-network with subnet 10.10.42.0/24
 [vaultron] [=] Form Vaultron! 
 [vaultron] [i] Terraform has been successfully initialized! 
-[vaultron] [i] Vault OSS version: 1.7.0 
+[vaultron] [i] Vault OSS version: 1.7.2 
 [vaultron] [i] Vault flavor: Integrated storage backed 
-[vaultron] [i] Terraform plan: 4 to add, 0 to change, 0 to destroy. 
-[vaultron] [i] Terraform apply complete! resources: 4 added, 0 changed, 0 destroyed. 
-[vaultron] [+] Vaultron formed in 7s.
+[vaultron] [i] Terraform plan: 6 to add, 0 to change, 0 to destroy. 
+[vaultron] [i] Terraform apply complete! resources: 6 added, 0 changed, 0 destroyed. 
+[vaultron] [+] Vaultron formed in 31s.
 ```
 
 Note the **Vault flavor: Integrated storage backed** part.

black_lion/templates/oss/vault_config_1.7.1.hcl

@@ -0,0 +1,32 @@
+# Vault OSS v1.7.0
+
+# -----------------------------------------------------------------------
+# Global configuration
+# -----------------------------------------------------------------------
+
+api_addr         = "${api_addr}"
+cluster_name     = "${cluster_name}"
+cluster_address  = "${cluster_address}"
+disable_mlock    = "${disable_mlock}"
+log_level        = "${log_level}"
+ui               = true
+plugin_directory = "/vault/plugins"
+
+# -----------------------------------------------------------------------
+# Listener configuration
+# -----------------------------------------------------------------------
+
+listener "tcp" {
+  address       = "${address}"
+  tls_cert_file = "/etc/ssl/certs/vault-server.crt"
+  tls_key_file  = "/etc/ssl/vault-server.key"
+}
+
+# -----------------------------------------------------------------------
+# Enable Prometheus metrics by default
+# -----------------------------------------------------------------------
+
+telemetry {
+  prometheus_retention_time = "30s"
+  disable_hostname          = false
+}

black_lion/templates/oss/vault_config_1.7.2.hcl

@@ -0,0 +1,32 @@
+# Vault OSS v1.7.0
+
+# -----------------------------------------------------------------------
+# Global configuration
+# -----------------------------------------------------------------------
+
+api_addr         = "${api_addr}"
+cluster_name     = "${cluster_name}"
+cluster_address  = "${cluster_address}"
+disable_mlock    = "${disable_mlock}"
+log_level        = "${log_level}"
+ui               = true
+plugin_directory = "/vault/plugins"
+
+# -----------------------------------------------------------------------
+# Listener configuration
+# -----------------------------------------------------------------------
+
+listener "tcp" {
+  address       = "${address}"
+  tls_cert_file = "/etc/ssl/certs/vault-server.crt"
+  tls_key_file  = "/etc/ssl/vault-server.key"
+}
+
+# -----------------------------------------------------------------------
+# Enable Prometheus metrics by default
+# -----------------------------------------------------------------------
+
+telemetry {
+  prometheus_retention_time = "30s"
+  disable_hostname          = false
+}

flavors/consul/vaultron.tf

@@ -12,12 +12,12 @@ terraform {
 
 # Set TF_VAR_vault_version to override this
 variable "vault_version" {
-  default = "1.7.0"
+  default = "1.7.2"
 }
 
 # Set TF_VAR_consul_version to override this
 variable "consul_version" {
-  default = "1.9.4"
+  default = "1.9.5"
 }
 
 # -----------------------------------------------------------------------

flavors/raft/vaultron.tf

@@ -12,7 +12,7 @@ terraform {
 
 # Set TF_VAR_vault_version to override this
 variable "vault_version" {
-  default = "1.7.0"
+  default = "1.7.2"
 }
 
 # -----------------------------------------------------------------------

red_lion/templates/oss/consul_oss_client_config_1.9.5.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
+  }
+}

red_lion/templates/oss/consul_oss_server_config_1.9.5.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
+}

version.txt

@@ -1 +1 @@
-3.7.2
+3.7.4