From 9291154f78e7ae92df91c334713efe3dd1ae0439 Mon Sep 17 00:00:00 2001 From: denyeart Date: Thu, 2 Jul 2020 15:37:15 -0400 Subject: [PATCH] Remove gossip leader election config from samples (#223) In Fabric v2.2, the gossip defaults are changed to make peers org leaders instead of using leader election. This change removes the config from the samples, so that the samples simply inherit the new peer defaults. This will simplify the sample configuration. Signed-off-by: David Enyeart --- interest_rate_swaps/network/docker-compose.yaml | 2 -- test-network/addOrg3/docker/docker-compose-org3.yaml | 2 -- test-network/docker/docker-compose-test-net.yaml | 4 ---- 3 files changed, 8 deletions(-) diff --git a/interest_rate_swaps/network/docker-compose.yaml b/interest_rate_swaps/network/docker-compose.yaml index 371ef048..39739b96 100644 --- a/interest_rate_swaps/network/docker-compose.yaml +++ b/interest_rate_swaps/network/docker-compose.yaml @@ -20,8 +20,6 @@ services: - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - FABRIC_LOGGING_SPEC=INFO - CORE_PEER_TLS_ENABLED=false - - CORE_PEER_GOSSIP_USELEADERELECTION=true - - CORE_PEER_GOSSIP_ORGLEADER=false - CORE_PEER_PROFILE_ENABLED=true - CORE_PEER_ADDRESSAUTODETECT=true working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer diff --git a/test-network/addOrg3/docker/docker-compose-org3.yaml b/test-network/addOrg3/docker/docker-compose-org3.yaml index 370d1db9..d20af54d 100644 --- a/test-network/addOrg3/docker/docker-compose-org3.yaml +++ b/test-network/addOrg3/docker/docker-compose-org3.yaml @@ -26,8 +26,6 @@ services: - FABRIC_LOGGING_SPEC=INFO #- FABRIC_LOGGING_SPEC=DEBUG - CORE_PEER_TLS_ENABLED=true - - CORE_PEER_GOSSIP_USELEADERELECTION=true - - CORE_PEER_GOSSIP_ORGLEADER=false - CORE_PEER_PROFILE_ENABLED=true - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/tls/server.crt - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key diff --git a/test-network/docker/docker-compose-test-net.yaml b/test-network/docker/docker-compose-test-net.yaml index 43a4157a..18f06f06 100644 --- a/test-network/docker/docker-compose-test-net.yaml +++ b/test-network/docker/docker-compose-test-net.yaml @@ -61,8 +61,6 @@ services: - FABRIC_LOGGING_SPEC=INFO #- FABRIC_LOGGING_SPEC=DEBUG - CORE_PEER_TLS_ENABLED=true - - CORE_PEER_GOSSIP_USELEADERELECTION=true - - CORE_PEER_GOSSIP_ORGLEADER=false - CORE_PEER_PROFILE_ENABLED=true - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/tls/server.crt - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key @@ -101,8 +99,6 @@ services: - FABRIC_LOGGING_SPEC=INFO #- FABRIC_LOGGING_SPEC=DEBUG - CORE_PEER_TLS_ENABLED=true - - CORE_PEER_GOSSIP_USELEADERELECTION=true - - CORE_PEER_GOSSIP_ORGLEADER=false - CORE_PEER_PROFILE_ENABLED=true - CORE_PEER_TLS_CERT_FILE=/etc/hyperledger/fabric/tls/server.crt - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key