[FAB-8516] cryptogen NodeOUs should match fabric-ca

mastersingh24 · mastersingh24 · commit 4eea8a96bf4e · 2018-02-25T05:49:57.000-05:00
cryptogen generates the following NodeOUs (when
enabled):
OU=FabricClient
OU=FabricPeer

fabric-ca generates:
OU=client
OU=peer

This causes issues if you try to bootstrap a
network with cryptogen and then enroll clients
with fabric-ca.

It's trivial to make cryptogen use the same
OUs as fabric-ca.

Change-Id: I817f5e034822cfb1b6ce6bf5635a5e19fe6b74ba
Signed-off-by: Gari Singh &lt;gari.r.singh@gmail.com&gt;
diff --git a/common/tools/cryptogen/msp/generator.go b/common/tools/cryptogen/msp/generator.go
@@ -28,8 +28,8 @@ const (
 )
 
 const (
-	CLIENTOU = "FabricClient"
-	PEEROU   = "FabricPeer"
+	CLIENTOU = "client"
+	PEEROU   = "peer"
 )
 
 var nodeOUMap = map[int]string{

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ const (`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`const (`
`31`		`- CLIENTOU = "FabricClient"`
`32`		`- PEEROU = "FabricPeer"`
	`31`	`+ CLIENTOU = "client"`
	`32`	`+ PEEROU = "peer"`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`var nodeOUMap = map[int]string{`