From 285fcf5878a69fe70db8bb2e384aabec25983c25 Mon Sep 17 00:00:00 2001
From: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com>
Date: Thu, 10 Oct 2019 14:28:30 -0400
Subject: [PATCH 1/2] bug: VAULT_CLUSTER_ADDR not used in raft

---
 command/server.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/command/server.go b/command/server.go
index 0bf67ee5fcf3..8a58c8ff13a7 100644
--- a/command/server.go
+++ b/command/server.go
@@ -579,10 +579,20 @@ func (c *ServerCommand) Run(args []string) int {
 		c.UI.Error(fmt.Sprintf("Unknown storage type %s", config.Storage.Type))
 		return 1
 	}
-	if config.Storage.Type == "raft" && len(config.ClusterAddr) == 0 {
-		c.UI.Error("Cluster address must be set when using raft storage")
-		return 1
+
+
+	if config.Storage.Type == "raft" {
+		if config.ClusterAddr == "" {
+			if envCA := os.Getenv("VAULT_CLUSTER_ADDR"); envCA != "" {
+				config.ClusterAddr = envCA
+			}
+		}
+		if len(config.ClusterAddr) == 0 {
+			c.UI.Error("Cluster address must be set when using raft storage")
+			return 1
+		}
 	}
+
 	namedStorageLogger := c.logger.Named("storage." + config.Storage.Type)
 	allLoggers = append(allLoggers, namedStorageLogger)
 	backend, err := factory(config.Storage.Config, namedStorageLogger)

From 44dca3c4949f660f1aefdc09f6238299acc51ec2 Mon Sep 17 00:00:00 2001
From: Jason O'Donnell <2160810+jasonodonnell@users.noreply.github.com>
Date: Thu, 10 Oct 2019 14:39:48 -0400
Subject: [PATCH 2/2] Make env take precedence

---
 command/server.go | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/command/server.go b/command/server.go
index 8a58c8ff13a7..e113cbc39f0e 100644
--- a/command/server.go
+++ b/command/server.go
@@ -582,11 +582,10 @@ func (c *ServerCommand) Run(args []string) int {
 
 
 	if config.Storage.Type == "raft" {
-		if config.ClusterAddr == "" {
-			if envCA := os.Getenv("VAULT_CLUSTER_ADDR"); envCA != "" {
-				config.ClusterAddr = envCA
-			}
+		if envCA := os.Getenv("VAULT_CLUSTER_ADDR"); envCA != "" {
+			config.ClusterAddr = envCA
 		}
+
 		if len(config.ClusterAddr) == 0 {
 			c.UI.Error("Cluster address must be set when using raft storage")
 			return 1