From 7b76a7a5ad0ea343f081275d8ddb371d2240191c Mon Sep 17 00:00:00 2001 From: Nick Gaski Date: Wed, 8 Nov 2017 15:18:50 -0500 Subject: [PATCH] [FAB-6632] - Artifacts for BYFN reconfigure This CR adds two new yaml files that are specific to a new organization - Org3 - that will join the existing application channel. Also adds a separate docker-compose that is specific to the new org - Org3. Update byfn.sh to remove the Org3 artifacts Reliant on CR - 15323 Change-Id: I22a08be6f8472f981c4231491b7cae56906b71dd Signed-off-by: Nick Gaski --- first-network/byfn.sh | 2 +- first-network/docker-compose-org3.yaml | 83 +++++++++++++++++++ first-network/org3-artifacts/configtx.yaml | 31 +++++++ first-network/org3-artifacts/org3-crypto.yaml | 18 ++++ 4 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 first-network/docker-compose-org3.yaml create mode 100644 first-network/org3-artifacts/configtx.yaml create mode 100644 first-network/org3-artifacts/org3-crypto.yaml diff --git a/first-network/byfn.sh b/first-network/byfn.sh index 8e1858c8ea..ec558bd888 100755 --- a/first-network/byfn.sh +++ b/first-network/byfn.sh @@ -136,7 +136,7 @@ function networkDown () { #Cleanup images removeUnwantedImages # remove orderer block and other channel configuration transactions and certs - rm -rf channel-artifacts/*.block channel-artifacts/*.tx crypto-config + rm -rf channel-artifacts/*.block channel-artifacts/*.tx crypto-config ./org3-artifacts/crypto-config/ channel-artifacts/org3.json # remove the docker-compose yaml file that was customized to the example rm -f docker-compose-e2e.yaml fi diff --git a/first-network/docker-compose-org3.yaml b/first-network/docker-compose-org3.yaml new file mode 100644 index 0000000000..975d42f875 --- /dev/null +++ b/first-network/docker-compose-org3.yaml @@ -0,0 +1,83 @@ +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# + +version: '2' + + +networks: + byfn: + +services: + + peer0.org3.example.com: + container_name: peer0.org3.example.com + extends: + file: base/peer-base.yaml + service: peer-base + environment: + - CORE_PEER_ID=peer0.org3.example.com + - CORE_PEER_ADDRESS=peer0.org3.example.com:7051 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.org3.example.com:7051 + - CORE_PEER_LOCALMSPID=Org3MSP + volumes: + - /var/run/:/host/var/run/ + - ./org3-artifacts/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/msp:/etc/hyperledger/fabric/msp + - ./org3-artifacts/crypto-config/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls:/etc/hyperledger/fabric/tls + ports: + - 11051:7051 + - 11053:7053 + networks: + - byfn + + peer1.org3.example.com: + container_name: peer1.org3.example.com + extends: + file: base/peer-base.yaml + service: peer-base + environment: + - CORE_PEER_ID=peer1.org3.example.com + - CORE_PEER_ADDRESS=peer1.org3.example.com:7051 + - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer1.org3.example.com:7051 + - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.org3.example.com:7051 + - CORE_PEER_LOCALMSPID=Org3MSP + volumes: + - /var/run/:/host/var/run/ + - ./org3-artifacts/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/msp:/etc/hyperledger/fabric/msp + - ./org3-artifacts/crypto-config/peerOrganizations/org3.example.com/peers/peer1.org3.example.com/tls:/etc/hyperledger/fabric/tls + ports: + - 12051:7051 + - 12053:7053 + networks: + - byfn + + + Org3cli: + container_name: Org3cli + image: hyperledger/fabric-tools + tty: true + environment: + - GOPATH=/opt/gopath + - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock + - CORE_LOGGING_LEVEL=DEBUG + - CORE_PEER_ID=Org3cli + - CORE_PEER_ADDRESS=peer0.org3.example.com:7051 + - CORE_PEER_LOCALMSPID=Org3MSP + - CORE_PEER_TLS_ENABLED=true + - CORE_PEER_TLS_CERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.crt + - CORE_PEER_TLS_KEY_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/server.key + - CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt + - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org3.example.com/users/Admin@org3.example.com/msp + working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer + command: /bin/bash -c 'sleep 10000' + volumes: + - /var/run/:/host/var/run/ + - ./../chaincode/:/opt/gopath/src/github.com/chaincode + - ./org3-artifacts/crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ + - ./scripts:/opt/gopath/src/github.com/hyperledger/fabric/peer/scripts/ + depends_on: + - peer0.org3.example.com + - peer1.org3.example.com + networks: + - byfn diff --git a/first-network/org3-artifacts/configtx.yaml b/first-network/org3-artifacts/configtx.yaml new file mode 100644 index 0000000000..e1205455c6 --- /dev/null +++ b/first-network/org3-artifacts/configtx.yaml @@ -0,0 +1,31 @@ +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# + +--- +################################################################################ +# +# Section: Organizations +# +# - This section defines the different organizational identities which will +# be referenced later in the configuration. +# +################################################################################ +Organizations: + - &Org3 + # DefaultOrg defines the organization which is used in the sampleconfig + # of the fabric.git development environment + Name: Org3MSP + + # ID to load the MSP definition as + ID: Org3MSP + + MSPDir: crypto-config/peerOrganizations/org3.example.com/msp + + AnchorPeers: + # AnchorPeers defines the location of peers which can be used + # for cross org gossip communication. Note, this value is only + # encoded in the genesis block in the Application section context + - Host: peer0.org3.example.com + Port: 7051 diff --git a/first-network/org3-artifacts/org3-crypto.yaml b/first-network/org3-artifacts/org3-crypto.yaml new file mode 100644 index 0000000000..24b5dd889c --- /dev/null +++ b/first-network/org3-artifacts/org3-crypto.yaml @@ -0,0 +1,18 @@ +# Copyright IBM Corp. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# + +# --------------------------------------------------------------------------- +# "PeerOrgs" - Definition of organizations managing peer nodes +# --------------------------------------------------------------------------- +PeerOrgs: + # --------------------------------------------------------------------------- + # Org3 + # --------------------------------------------------------------------------- + - Name: Org3 + Domain: org3.example.com + Template: + Count: 2 + Users: + Count: 1