From efaadd329da0728b700e0ecc37779ff2ecf00b96 Mon Sep 17 00:00:00 2001 From: Yoav Tock Date: Thu, 7 Mar 2019 14:59:55 +0200 Subject: [PATCH] FAB-14531 BYFN Raft with 5 nodes Extend the 3-node etcd/raft cluster in BYFN to 5 nodes, in order to better support the documentation effort. This will allow users to experiment creating channels with less then 5 nodes, but avoid the pitfalls of a 2-node cluster. Change-Id: I5ba1d6039b4bb4864b2b97271de81fbfe91b4fb5 Signed-off-by: Yoav Tock --- first-network/configtx.yaml | 10 +++++++ first-network/crypto-config.yaml | 3 ++ first-network/docker-compose-etcdraft2.yaml | 32 +++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/first-network/configtx.yaml b/first-network/configtx.yaml index a366fea253..6a363b39fb 100644 --- a/first-network/configtx.yaml +++ b/first-network/configtx.yaml @@ -381,10 +381,20 @@ Profiles: Port: 7050 ClientTLSCert: crypto-config/ordererOrganizations/example.com/orderers/orderer3.example.com/tls/server.crt ServerTLSCert: crypto-config/ordererOrganizations/example.com/orderers/orderer3.example.com/tls/server.crt + - Host: orderer4.example.com + Port: 7050 + ClientTLSCert: crypto-config/ordererOrganizations/example.com/orderers/orderer4.example.com/tls/server.crt + ServerTLSCert: crypto-config/ordererOrganizations/example.com/orderers/orderer4.example.com/tls/server.crt + - Host: orderer5.example.com + Port: 7050 + ClientTLSCert: crypto-config/ordererOrganizations/example.com/orderers/orderer5.example.com/tls/server.crt + ServerTLSCert: crypto-config/ordererOrganizations/example.com/orderers/orderer5.example.com/tls/server.crt Addresses: - orderer.example.com:7050 - orderer2.example.com:7050 - orderer3.example.com:7050 + - orderer4.example.com:7050 + - orderer5.example.com:7050 Organizations: - *OrdererOrg diff --git a/first-network/crypto-config.yaml b/first-network/crypto-config.yaml index ffd87ffb76..a38299b596 100644 --- a/first-network/crypto-config.yaml +++ b/first-network/crypto-config.yaml @@ -19,6 +19,9 @@ OrdererOrgs: - Hostname: orderer - Hostname: orderer2 - Hostname: orderer3 + - Hostname: orderer4 + - Hostname: orderer5 + # --------------------------------------------------------------------------- # "PeerOrgs" - Definition of organizations managing peer nodes # --------------------------------------------------------------------------- diff --git a/first-network/docker-compose-etcdraft2.yaml b/first-network/docker-compose-etcdraft2.yaml index 18a185aee3..1e525ee2bf 100644 --- a/first-network/docker-compose-etcdraft2.yaml +++ b/first-network/docker-compose-etcdraft2.yaml @@ -8,6 +8,8 @@ version: '2' volumes: orderer2.example.com: orderer3.example.com: + orderer4.example.com: + orderer5.example.com: networks: byfn: @@ -43,3 +45,33 @@ services: - orderer3.example.com:/var/hyperledger/production/orderer ports: - 9050:7050 + + orderer4.example.com: + extends: + file: base/peer-base.yaml + service: orderer-base + container_name: orderer4.example.com + networks: + - byfn + volumes: + - ./channel-artifacts/genesis.block:/var/hyperledger/orderer/orderer.genesis.block + - ./crypto-config/ordererOrganizations/example.com/orderers/orderer4.example.com/msp:/var/hyperledger/orderer/msp + - ./crypto-config/ordererOrganizations/example.com/orderers/orderer4.example.com/tls/:/var/hyperledger/orderer/tls + - orderer4.example.com:/var/hyperledger/production/orderer + ports: + - 10050:7050 + + orderer5.example.com: + extends: + file: base/peer-base.yaml + service: orderer-base + container_name: orderer5.example.com + networks: + - byfn + volumes: + - ./channel-artifacts/genesis.block:/var/hyperledger/orderer/orderer.genesis.block + - ./crypto-config/ordererOrganizations/example.com/orderers/orderer5.example.com/msp:/var/hyperledger/orderer/msp + - ./crypto-config/ordererOrganizations/example.com/orderers/orderer5.example.com/tls/:/var/hyperledger/orderer/tls + - orderer5.example.com:/var/hyperledger/production/orderer + ports: + - 11050:7050