Skip to content

Commit

Permalink
FAB-14317 Add default policies to org3
Browse files Browse the repository at this point in the history
Configtxgen was failing to print the org definition for org3 because it
was missing the required policies for the org definition.  This caused a
failure in the CI test for adding an org.

Because it will be needed in the future, this CR also adds the new
lifecycle endorsement and general endorsement policies to the
configtx.yamls as well.

Change-Id: Ie53165231cf8afe6377b51a28625797b15ca78ec
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
  • Loading branch information
Jason Yellick committed Feb 25, 2019
1 parent 7b673ff commit 2b68c80
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
12 changes: 12 additions & 0 deletions first-network/configtx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ Organizations:
Admins:
Type: Signature
Rule: "OR('Org1MSP.admin')"
Endorsement:
Type: Signature
Rule: "OR('Org1MSP.peer')"

# leave this flag set to true.
AnchorPeers:
Expand Down Expand Up @@ -96,6 +99,9 @@ Organizations:
Admins:
Type: Signature
Rule: "OR('Org2MSP.admin')"
Endorsement:
Type: Signature
Rule: "OR('Org2MSP.peer')"

AnchorPeers:
# AnchorPeers defines the location of peers which can be used
Expand Down Expand Up @@ -190,6 +196,12 @@ Application: &ApplicationDefaults
Admins:
Type: ImplicitMeta
Rule: "MAJORITY Admins"
LifecycleEndorsement:
Type: ImplicitMeta
Rule: "MAJORITY Endorsement"
Endorsement:
Type: ImplicitMeta
Rule: "MAJORITY Endorsement"

Capabilities:
<<: *ApplicationCapabilities
Expand Down
14 changes: 14 additions & 0 deletions first-network/org3-artifacts/configtx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,17 @@ Organizations:
# encoded in the genesis block in the Application section context
- Host: peer0.org3.example.com
Port: 11051

Policies:
Readers:
Type: Signature
Rule: "OR('Org3MSP.admin', 'Org3MSP.peer', 'Org3MSP.client')"
Writers:
Type: Signature
Rule: "OR('Org3MSP.admin', 'Org3MSP.client')"
Admins:
Type: Signature
Rule: "OR('Org3MSP.admin')"
Endorsement:
Type: Signature
Rule: "OR('Org3MSP.peer')"

0 comments on commit 2b68c80

Please sign in to comment.