From 9b8f50e2d0bc397c757138ece7ea8c47270534e3 Mon Sep 17 00:00:00 2001 From: Will Lahti Date: Mon, 11 Jan 2021 11:27:58 -0500 Subject: [PATCH] Remove Org3cli and configtx.yaml anchor peers from test-network (#401) * Remove Org3cli from test-network FAB-18381 Signed-off-by: Will Lahti * Remove configtx.yaml anchor peers from test-network These values were only used by configtxgen's --outputAnchorPeerUpdate function and should not be set in a channel genesis block This is because a peer cannot be an anchor peer for a channel until it has joined that channel and it can't join a channel until the genesis block has been created. FAB-18381 Signed-off-by: Will Lahti --- test-network/addOrg3/configtx.yaml | 7 ----- .../addOrg3/docker/docker-compose-org3.yaml | 30 ------------------- test-network/configtx/configtx.yaml | 15 ---------- 3 files changed, 52 deletions(-) diff --git a/test-network/addOrg3/configtx.yaml b/test-network/addOrg3/configtx.yaml index 1782a703..93502f02 100644 --- a/test-network/addOrg3/configtx.yaml +++ b/test-network/addOrg3/configtx.yaml @@ -36,10 +36,3 @@ Organizations: Endorsement: Type: Signature Rule: "OR('Org3MSP.peer')" - - AnchorPeers: - # AnchorPeers defines the location of peers which can be used - # for cross org gossip communication. Note, this value is only - # encoded in the genesis block in the Application section context - - Host: peer0.org3.example.com - Port: 11051 diff --git a/test-network/addOrg3/docker/docker-compose-org3.yaml b/test-network/addOrg3/docker/docker-compose-org3.yaml index 65561737..9727e99a 100644 --- a/test-network/addOrg3/docker/docker-compose-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-org3.yaml @@ -50,33 +50,3 @@ services: - 11051:11051 networks: - test - - Org3cli: - container_name: Org3cli - image: hyperledger/fabric-tools:$IMAGE_TAG - tty: true - stdin_open: true - environment: - - GOPATH=/opt/gopath - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - FABRIC_LOGGING_SPEC=INFO - #- FABRIC_LOGGING_SPEC=DEBUG - - CORE_PEER_ID=Org3cli - - CORE_PEER_ADDRESS=peer0.org3.example.com:11051 - - CORE_PEER_LOCALMSPID=Org3MSP - - CORE_PEER_TLS_ENABLED=true - - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.crt - - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.key - - CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt - - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/organizations/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp - working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer - command: /bin/bash - volumes: - - /var/run/docker.sock:/host/var/run/docker.sock - - ../../../chaincode/:/opt/gopath/src/github.com/chaincode - - ../../organizations:/opt/gopath/src/github.com/hyperledger/fabric/peer/organizations - - ../../scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ - depends_on: - - peer0.org3.example.com - networks: - - test diff --git a/test-network/configtx/configtx.yaml b/test-network/configtx/configtx.yaml index ad72c1e7..77db240f 100644 --- a/test-network/configtx/configtx.yaml +++ b/test-network/configtx/configtx.yaml @@ -71,14 +71,6 @@ Organizations: Type: Signature Rule: "OR('Org1MSP.peer')" - # leave this flag set to true. - AnchorPeers: - # AnchorPeers defines the location of peers which can be used - # for cross org gossip communication. Note, this value is only - # encoded in the genesis block in the Application section context - - Host: peer0.org1.example.com - Port: 7051 - - &Org2 # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment @@ -106,13 +98,6 @@ Organizations: Type: Signature Rule: "OR('Org2MSP.peer')" - AnchorPeers: - # AnchorPeers defines the location of peers which can be used - # for cross org gossip communication. Note, this value is only - # encoded in the genesis block in the Application section context - - Host: peer0.org2.example.com - Port: 9051 - ################################################################################ # # SECTION: Capabilities