[FAB-2432] Encode anchor peers from configtx.yaml

https://jira.hyperledger.org/browse/FAB-2432 This CR takes the already specified anchor peers from the configtx.yaml and causes configtxgen to actually encode them into the genesis block / configtx it generates. Change-Id: Ia2144ae6a245b274810ebedeb772a3d44a062cca Signed-off-by: Jason Yellick <[email protected]>
hyperledger · Feb 22, 2017 · 4013cb6 · 4013cb6
1 parent 2fc6bc6
commit 4013cb6
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/common/configtx/tool/provisional/provisional.go b/common/configtx/tool/provisional/provisional.go
@@ -32,6 +32,7 @@ import (
 	"github.com/hyperledger/fabric/orderer/common/bootstrap"
 	cb "github.com/hyperledger/fabric/protos/common"
 	ab "github.com/hyperledger/fabric/protos/orderer"
+	pb "github.com/hyperledger/fabric/protos/peer"
 
 	logging "github.com/op/go-logging"
 )
@@ -147,7 +148,17 @@ func New(conf *genesisconfig.Profile) Generator {
 			if err != nil {
 				logger.Panicf("Error loading MSP configuration for org %s: %s", org.Name, err)
 			}
-			bs.ordererGroups = append(bs.ordererGroups, configvaluesmsp.TemplateGroupMSP([]string{configtxapplication.GroupKey, org.Name}, mspConfig))
+			bs.applicationGroups = append(bs.applicationGroups, configvaluesmsp.TemplateGroupMSP([]string{configtxapplication.GroupKey, org.Name}, mspConfig))
+
+			var anchorProtos []*pb.AnchorPeer
+			for _, anchorPeer := range org.AnchorPeers {
+				anchorProtos = append(anchorProtos, &pb.AnchorPeer{
+					Host: anchorPeer.Host,
+					Port: int32(anchorPeer.Port),
+				})
+			}
+
+			bs.applicationGroups = append(bs.applicationGroups, configtxapplication.TemplateAnchorPeers(org.Name, anchorProtos))
 		}
 
 	}