[FAB-17504] add Organizations.<Org>.OrdererEndpoints and remove Orderer.Addresses

Description

The use of Orderer.Addresses in configtx.yaml is deprecated, and Organizations.<Org>.OrdererEndpoints should be used instead. Therefore, update all the fabric-samples configtx.yaml files.

Related issues

https://jira.hyperledger.org/browse/FAB-17504

Signed-off-by: xu wu <wuxu1103@163.com>
This commit is contained in:
xu wu 2020-02-18 19:40:13 +08:00
parent e5b898c08d
commit 8af5455be2
3 changed files with 9 additions and 8 deletions

View file

@ -41,6 +41,9 @@ Organizations:
Type: Signature
Rule: "OR('OrdererMSP.admin')"
OrdererEndpoints:
- orderer.example.com:7050
- &Org1
# DefaultOrg defines the organization which is used in the sampleconfig
# of the fabric.git development environment
@ -215,9 +218,6 @@ Orderer: &OrdererDefaults
# Orderer Type: The orderer implementation to start
OrdererType: etcdraft
Addresses:
- orderer.example.com:7050
# Batch Timeout: The amount of time to wait before creating a batch
BatchTimeout: 2s

View file

@ -41,6 +41,9 @@ Organizations:
Type: Signature
Rule: "OR('orderer.admin')"
OrdererEndpoints:
- irs-orderer:7050
- &partya
# DefaultOrg defines the organization which is used in the sampleconfig
# of the fabric.git development environment
@ -324,9 +327,6 @@ Orderer: &OrdererDefaults
# Available types are "solo" and "kafka"
OrdererType: solo
Addresses:
- irs-orderer:7050
# Batch Timeout: The amount of time to wait before creating a batch
BatchTimeout: 2s

View file

@ -41,6 +41,9 @@ Organizations:
Type: Signature
Rule: "OR('OrdererMSP.admin')"
OrdererEndpoints:
- orderer.example.com:7050
- &Org1
# DefaultOrg defines the organization which is used in the sampleconfig
# of the fabric.git development environment
@ -222,8 +225,6 @@ Orderer: &OrdererDefaults
Port: 7050
ClientTLSCert: ../organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt
ServerTLSCert: ../organizations/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt
Addresses:
- orderer.example.com:7050
# Batch Timeout: The amount of time to wait before creating a batch
BatchTimeout: 2s