Commit graph

23 commits

Author SHA1 Message Date
xu wu
7f5f5e6c66
[FAB-17504] add Organizations.<Org>.OrdererEndpoints and remove Orderer.Addresses (#125)
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>
2020-03-20 16:02:44 +01:00
David Enyeart
e48e804828 [FAB-16776] Move BYFN up to V2_0 capabilities
Using V2_0_0 capabilities will turn on identification of admins
via node OU, and will fix the failing sample since cryptogen
is now setup to generate admins via node OU.

Change-Id: I30ff651a112bd88c93f6563f5e4414f8d2c6693e
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-10-06 16:30:19 -04:00
Simon Stone
18712ca8f6 [FAB-16133] Remove Solo consensus from BYFN
A Solo ordering node offers no benefits over
a single node Raft ordering node. Raft is the
best practice for Fabric v2.0, and should be
the only option in the BYFN sample going
forwards.

This CR removes Solo and the consensus related
options from BYFN, and always uses Raft.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I686cb68d8bc8fc9a231a0fa680263175451f2820
2019-08-27 10:00:07 +01:00
Simon Stone
3907507981 [FAB-16277] Update BYFN w/ Raft ports in Docker network
Update the Raft ordering nodes to use the same ports
inside the Docker network as they are mapped to outside
of the Docker network (7050, 8050, 9050, 10050, 11050).

This enables applications to work using service
discovery, whether those applications are running inside
or outside the Docker network.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I40b24653d76b6e60c73b754cd7e1544c333e0021
2019-08-12 16:12:09 +01:00
Simon Stone
b62d5bd77b [FAB-16132] Remove Kafka consensus from BYFN
Remove Kafka as a consensus mechanism option
in BYFN, including all related configuration.

Users wishing to configure Kafka (not best
practice) in Fabric v2.0 can consult the
Fabric v1.4 and earlier samples.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I3bbffc876a6b64831cb6b2bdfac28a88cc013bdf
2019-08-08 13:07:27 +01:00
Alessandro Sorniotti
d24577fb5d Merge "[FAB-14711] update byfn with new lifecycle" 2019-03-26 17:14:09 +00:00
Alessandro Sorniotti
27774297ec [FAB-14711] update byfn with new lifecycle
Change-Id: I24dd3e85f6dedab52b05ce3103ee06435f01f9a3
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>
2019-03-26 16:25:14 +01:00
Yoav Tock
efaadd329d 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 <tock@il.ibm.com>
2019-03-07 15:00:04 +02:00
Yoav Tock
420ba2311c FAB-12762 Add etcd/raft consensus option to BYFN
Augment the fabric-samples first-network sample to include an option
to choose etcd/raft as consensus-type.

Extend the -o flag so that it allows users to choose between the
solo, kafka, or etcdraft consensus-type for the ordering service.

Use three orderer nodes.

Change-Id: Ibc4c3564220466aef0a87baee4a2d594e5554a62
Signed-off-by: Yoav Tock <tock@il.ibm.com>
2019-02-28 16:09:17 +02:00
Jason Yellick
2b68c80716 FAB-14317 Add default policies to org3
Configtxgen was failing to print the org definition for org3 because it
was missing the required policies for the org definition.  This caused a
failure in the CI test for adding an org.

Because it will be needed in the future, this CR also adds the new
lifecycle endorsement and general endorsement policies to the
configtx.yamls as well.

Change-Id: Ie53165231cf8afe6377b51a28625797b15ca78ec
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
2019-02-24 20:56:35 -05:00
David Enyeart
7b673ffd2f Merge "[FAB-14268] Make BYFN/EYFN ports match external ports" 2019-02-22 16:17:59 +00:00
Simon Stone
f942010fa6 [FAB-14268] Make BYFN/EYFN ports match external ports
Update both BYFN and EYFN so that the peer request and
chaincode ports match the externally mapped ports. This
enables applications both inside and outside the Docker
network to use service discovery to interact with these
networks (see the JIRA for more details).

Change-Id: I73c36dfdb269ec4225376fb04b1e7a087363e4cc
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2019-02-21 14:57:39 +00:00
Jason Yellick
4e2ce23e43 FAB-14271 Add channel policies to channel config
Previously, configtxgen would auto-populate policies if they were
omitted.  This presented some problems for specifying partial policy
schemes, like only overriding one policy.  Support for omitting policies
was deprecated in v1.3 and has been removed for v2.0.0.

Change-Id: Ie01bf8f05911358a0af144f2fe2df2667c2bf12e
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
2019-02-20 14:08:40 -05:00
Artem Barger
89fff6df43 Merge "FAB-13011 add kafka consensus type to byfn sample" 2018-12-13 09:14:35 +00:00
Surya Lanka
e1a39e685a [FAB-12724] Upgrade from 1.3.x to 1.4.0
Adding support to upgrade from 1.3.x to 1.4.0 using upgrade_to_v14.sh
and changes to byfn.sh

For this, no v1_4 capabilities need to be enabled other than v1_3
capabilities on channel and application group level

Only upgrading the images from v1.3.x to v.1.4.0 for peer, orderer,
cli, ccenv

Change-Id: I991f96c2deb3c91870ec4654aa8b561f49594248
Signed-off-by: Surya Lanka <suryalnvs@gmail.com>
2018-12-07 14:17:30 +00:00
Yoav Tock
7ad9f196a4 FAB-13011 add kafka consensus type to byfn sample
Augment the fabric-samples first-network sample to include a flag that allows a choice of  consensus-type:
solo (default) or kafka.

- Add note on production deployment of kafka
- Remove port mapping for kafka and zookeeper containars

Change-Id: I3204ba44e5974961eb69649b6f5744f52097ce80
Signed-off-by: Yoav Tock <tock@il.ibm.com>
2018-12-05 11:06:35 +02:00
David Enyeart
edee6387f1 [FAB-12184] Prepare fabric-samples for 1.3.0-rc1
Change-Id: I791a7dc50557547036209dbabb5a6c42ee2e0c38
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-09-26 13:16:02 -04:00
Surya
9ee57c6c22 [FAB-11778] Upgrade to v1.3.x from v1.2.x in byfn
Changes include upgrade from v1.2.x to v1.3.x.

First, upgrades the network from v1.2.x to v1.3.x and
upgrade_to_v13.sh will run config updates on /Channel level and
/Channel/Application level for v1_3 capabilities.

Add 15 sec's delay to couchdb tests

Change-Id: Ic2a1633842b7dd8a39ee674c5159d67b46122ff4
Signed-off-by: Surya <suryalnvs@gmail.com>
Signed-off-by: RameshBabu <rameshbabu.thoomu@gmail.com>
2018-09-17 14:34:27 +00:00
David Enyeart
3031a8c556 [FAB-10235] Update BYFN to use V1_2 capability
Update BYFN to use V1_2 application capability.
Required for private data collections.

Change-Id: I56c74b9fb6cd77864b5c8d13abb066a3d729500b
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-05-20 21:27:46 -04:00
Matthew Sykes
5cf19449f1 [FAB-10185] Reorder for logical consistency
Change-Id: I0274250c8c0c5d1801b6db0fb7bfce3359bb1c2f
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2018-05-17 11:06:09 -04:00
Matthew Sykes
e2f4f20bd6 [FAB-10176] Fix invalid configtx.yaml documents
Change-Id: Ibf52f9380ed3b724c594b53550321a12475e9860
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2018-05-17 08:41:05 -04:00
Angelo De Caro
24f35c1493 [FAB-7750] first network with support to FAB-5664
This change-set does the following:
- it modifies the first-network example to show how to use FAB-5664.
Namely, the identity classification is enabled by
setting EnableNodeOUs to true in crypto-config.yaml.
Then, the endorsement policy is changed to requires
peers and not members. Finally, cryptotx.yaml is modified
to enable v1.1 capabilities.

Change-Id: If8e943b5833b4402d612895449ac110ab2fee4b5
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
2018-02-15 13:19:22 +01:00
Christopher Ferris
3297865248 FAB-4073 build your first network sample
address review comments

Change-Id: Ia2382005d4503f9dc7ba845a2d04f36237316cde
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-06-21 05:42:36 +00:00