Vault v1.7.0

brianshumate · Apr 7, 2021 · eacde8b · eacde8b
1 parent ab86bcb
commit eacde8b
Show file tree

Hide file tree

Showing 12 changed files with 130 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 3.7.0
 
 - Vault v1.7.0
+- Consul v1.9.4
 - Update documentation
 
 ## 3.6.4

diff --git a/README.md b/README.md
@@ -187,14 +187,14 @@ When Vaultron is successfully formed, the output looks like this example.
 ```plaintext
 [vaultron] [?] vaultron-network not present; creating ...
 [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.6.2
-[vaultron] [i] Vault flavor: Consul storage backed
-[vaultron] [i] Consul OSS version: 1.9.2
-[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 11s.
+[vaultron] [=] Form Vaultron! 
+[vaultron] [i] Terraform has been successfully initialized! 
+[vaultron] [i] Vault OSS version: 1.7.0 
+[vaultron] [i] Vault flavor: Consul storage backed 
+[vaultron] [i] Consul OSS version: 1.9.4 
+[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.
 ```
 
 Now you can visit the Vault web UI at [https://localhost:8200](https://localhost:8200) or visit the Consul web UI at [https://localhost:8500](https://localhost:8500).
@@ -328,13 +328,13 @@ It is worth noting that when you `form` Vaultron, output will resemble this exam
 $ ./form
 [vaultron] [?] vaultron-network not present; creating ...
 [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.6.2
-[vaultron] [i] Vault flavor: Integrated storage backed
-[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 17s.
+[vaultron] [=] Form Vaultron! 
+[vaultron] [i] Terraform has been successfully initialized! 
+[vaultron] [i] Vault OSS version: 1.7.0 
+[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.
 ```
 
 Note the **Vault flavor: Integrated storage backed** part.
@@ -1046,15 +1046,15 @@ This means that Vaultron had problems during the `terraform plan` or `terraform
 
 Other red and equally frightening errors could occur, and these are usually accompanied by an explanation from Terraform regarding the nature of the problem.
 
-### Error: Unable to upload volume conten
+### Error: Unable to upload volume content
 
 Errors of this form (which can reference other directory names) typically indicate a problem with the underlying Docker storage.
 
 ```
 Error: Unable to upload volume content: Error response from daemon: error while creating mount source path '/home/user/src/vaultron/flavors/raft/vault/vault3/data': mkdir /home/user/src/vaultron/flavors/raft/vault/vault3: file exists
 ```
 
-You can work around this issue by using the **Preferences** > **Troubleshoot** > **Clean / Purge data** from within the Docker Desktop UI or otherwise reset the Docker storage.
+You can work around this issue by either restarting Docker Desktop, or by using the **Preferences** > **Troubleshoot** > **Clean / Purge data** from within the Docker Desktop UI or otherwise reset the Docker storage.
 
 ### Unknown token: 208:30 IDENT var.grafana_version
 

diff --git a/black_lion/templates/oss/vault_config_1.6.1.hcl b/black_lion/templates/oss/vault_config_1.6.1.hcl
@@ -1,4 +1,4 @@
-# Vault OSS v1.6.0
+# Vault OSS v1.6.1
 
 # -----------------------------------------------------------------------
 # Global configuration

diff --git a/black_lion/templates/oss/vault_config_1.6.2.hcl b/black_lion/templates/oss/vault_config_1.6.2.hcl
@@ -1,4 +1,4 @@
-# Vault OSS v1.6.0
+# Vault OSS v1.6.2
 
 # -----------------------------------------------------------------------
 # Global configuration

diff --git a/black_lion/templates/oss/vault_config_1.7.0.hcl b/black_lion/templates/oss/vault_config_1.7.0.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
+}
diff --git a/flavors/consul/vaultron.tf b/flavors/consul/vaultron.tf
@@ -12,12 +12,12 @@ terraform {
 
 # Set TF_VAR_vault_version to override this
 variable "vault_version" {
-  default = "1.6.2"
+  default = "1.7.0"
 }
 
 # Set TF_VAR_consul_version to override this
 variable "consul_version" {
-  default = "1.9.2"
+  default = "1.9.4"
 }
 
 # -----------------------------------------------------------------------

diff --git a/flavors/raft/vaultron.tf b/flavors/raft/vaultron.tf
@@ -12,7 +12,7 @@ terraform {
 
 # Set TF_VAR_vault_version to override this
 variable "vault_version" {
-  default = "1.6.2"
+  default = "1.7.0"
 }
 
 # -----------------------------------------------------------------------

diff --git a/red_lion/templates/oss/consul_oss_client_config_1.9.3.hcl b/red_lion/templates/oss/consul_oss_client_config_1.9.3.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_client_config_1.9.4.hcl b/red_lion/templates/oss/consul_oss_client_config_1.9.4.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.9.3.hcl b/red_lion/templates/oss/consul_oss_server_config_1.9.3.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/red_lion/templates/oss/consul_oss_server_config_1.9.4.hcl b/red_lion/templates/oss/consul_oss_server_config_1.9.4.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/version.txt b/version.txt
@@ -1 +1 @@
-3.6.4
+3.7.0