From 6142460b297b20d2c77f9049d8ea1ade6a1d75a1 Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Thu, 20 Feb 2014 16:27:14 -0800
Subject: [PATCH] consul: Only add ourself to the peerset if we are in
 bootstrap mode

---
 consul/server.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/consul/server.go b/consul/server.go
index 00fdcd5f4..e9fcf9a04 100644
--- a/consul/server.go
+++ b/consul/server.go
@@ -220,14 +220,16 @@ func (s *Server) setupRaft() error {
 	// Setup the peer store
 	s.raftPeers = raft.NewJSONPeers(path, trans)
 
-	// Ensure local host is always included
-	peers, err := s.raftPeers.Peers()
-	if err != nil {
-		store.Close()
-		return err
-	}
-	if !raft.PeerContained(peers, trans.LocalAddr()) {
-		s.raftPeers.SetPeers(raft.AddUniquePeer(peers, trans.LocalAddr()))
+	// Ensure local host is always included if we are in bootstrap mode
+	if s.config.Bootstrap {
+		peers, err := s.raftPeers.Peers()
+		if err != nil {
+			store.Close()
+			return err
+		}
+		if !raft.PeerContained(peers, trans.LocalAddr()) {
+			s.raftPeers.SetPeers(raft.AddUniquePeer(peers, trans.LocalAddr()))
+		}
 	}
 
 	// Make sure we set the LogOutput