Merge branch 'devel'

brianshumate · Aug 11, 2021 · b4a671e · b4a671e
2 parents 63f9c18 + 475dec0
commit b4a671e
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.8.1
+
+- Vault 1.8.1
+
 ## 3.8.0
 
 - Vault 1.8.0

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

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

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

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

diff --git a/black_lion/templates/oss/vault_config_1.8.1.hcl b/black_lion/templates/oss/vault_config_1.8.1.hcl
@@ -0,0 +1,32 @@
+# Vault OSS v1.8.1
+
+# -----------------------------------------------------------------------
+# 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/examples/terraform/main.tf b/examples/terraform/main.tf
@@ -5,6 +5,10 @@
 #     See README.md for more details
 # ========================================================================
 
+terraform {
+  required_version = ">= 0.13"
+}
+
 # We presume Vault at https://localhost:8200
 # and the presence of a ~/.vault-token here.
 

diff --git a/flavors/consul/vaultron.tf b/flavors/consul/vaultron.tf
@@ -3,7 +3,7 @@
 # =======================================================================
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
 }
 
 # -----------------------------------------------------------------------
@@ -12,7 +12,7 @@ terraform {
 
 # Set TF_VAR_vault_version to override this
 variable "vault_version" {
-  default = "1.8.0"
+  default = "1.8.1"
 }
 
 # Set TF_VAR_consul_version to override this

diff --git a/flavors/raft/vaultron.tf b/flavors/raft/vaultron.tf
@@ -3,7 +3,7 @@
 # =======================================================================
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
 }
 
 # -----------------------------------------------------------------------
@@ -12,7 +12,7 @@ terraform {
 
 # Set TF_VAR_vault_version to override this
 variable "vault_version" {
-  default = "1.8.0"
+  default = "1.8.1"
 }
 
 # -----------------------------------------------------------------------

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.8.0
+3.8.1