From a1b83d424b30565bcc45c56ce5fcc48b4c0b9bc6 Mon Sep 17 00:00:00 2001 From: Jason Yellick Date: Thu, 21 Nov 2019 12:26:45 -0500 Subject: [PATCH] FAB-16477 Fix regression in orderer bootstrap Introduced in the original of FAB-16477 was a regression which would cause the genesis file location to be ignored. This is because the sampleconfig specified a non-zero value for bootstrap file, preventing the old genesis file override from affecting it. This CR zeros the config. Signed-off-by: Jason Yellick Change-Id: I7aa11b451e1b711180a89aef2ad51ea73eeef82d --- sampleconfig/orderer.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sampleconfig/orderer.yaml b/sampleconfig/orderer.yaml index f8e24e6762a..1f70550de9d 100644 --- a/sampleconfig/orderer.yaml +++ b/sampleconfig/orderer.yaml @@ -74,15 +74,11 @@ General: # "none" - allows an orderer to start without a system channel configuration GenesisMethod: file - # The file containing the genesis block to use when initializing the orderer system channel - GenesisFile: genesisblock - # Bootstrap file: The file containing the bootstrap block to use when # initializing the orderer system channel and GenesisMethod is set to - # "file". Ignored if GenesisMethod is set to "provisional". - # The bootstrap file can be the genesis block, and it can also be a config block that expands the - # network to add orderer. - BootstrapFile: genesisblock + # "file". The bootstrap file can be the genesis block, and it can also be + # a config block for late bootstrap of some consensus methods like Raft. + BootstrapFile: # LocalMSPDir is where to find the private crypto material needed by the # orderer. It is set relative here as a default for dev environments but