diff --git a/RELEASING.md b/RELEASING.md index 8397b551405..ef43e87f1f8 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -62,7 +62,7 @@ cd fabric-samples/test-network export PATH=${PWD}/../bin:$PATH export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 diff --git a/docs/source/cc_basic.md b/docs/source/cc_basic.md index fce3a27ec12..afcd4fdae94 100644 --- a/docs/source/cc_basic.md +++ b/docs/source/cc_basic.md @@ -60,7 +60,7 @@ As a test, run the 'Contract Metadata' function as shown below. (For details on # Environment variables for Org1 export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 diff --git a/docs/source/couchdb_tutorial.rst b/docs/source/couchdb_tutorial.rst index facfa972316..870a6bf2e9d 100644 --- a/docs/source/couchdb_tutorial.rst +++ b/docs/source/couchdb_tutorial.rst @@ -430,7 +430,7 @@ command as Org1 to create an asset owned by "tom": # Environment variables for Org1 export CORE_PEER_TLS_ENABLED=true - export CORE_PEER_LOCALMSPID="Org1MSP" + export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 @@ -633,7 +633,7 @@ total of five assets owned by "tom": .. code:: bash - export CORE_PEER_LOCALMSPID="Org1MSP" + export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 diff --git a/docs/source/create_channel/add_orderer.md b/docs/source/create_channel/add_orderer.md index 73f52fbd3a1..168d51bd79c 100644 --- a/docs/source/create_channel/add_orderer.md +++ b/docs/source/create_channel/add_orderer.md @@ -85,7 +85,7 @@ as well, but is not a part of the network at this stage. This command also will The `peer` command uses environment variables to define the context of the organization in which it will run, we will change the context to: ```shell -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=$PEER0_ORG1_CA export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 @@ -266,7 +266,7 @@ peer channel signconfigtx -f envelope.pb Now we switch to the orderer organization `Orderer`: ```shell export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="OrdererMSP" +export CORE_PEER_LOCALMSPID=OrdererMSP export CORE_PEER_TLS_ROOTCERT_FILE=/var/hyperledger/orderer/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=/var/hyperledger/orderer/msp export CORE_PEER_ADDRESS=localhost:7050 @@ -353,7 +353,7 @@ peer channel signconfigtx -f envelope.pb Now switch to the orderer organization and post it: ```shell export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="OrdererMSP" +export CORE_PEER_LOCALMSPID=OrdererMSP export CORE_PEER_TLS_ROOTCERT_FILE=/var/hyperledger/orderer/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=/var/hyperledger/orderer/msp export CORE_PEER_ADDRESS=localhost:7050 diff --git a/docs/source/create_channel/create_channel_test_net.md b/docs/source/create_channel/create_channel_test_net.md index 278dccbe39e..6e713912d32 100644 --- a/docs/source/create_channel/create_channel_test_net.md +++ b/docs/source/create_channel/create_channel_test_net.md @@ -222,7 +222,7 @@ The test network includes two peer organizations each with one peer. But before ``` export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 @@ -244,7 +244,7 @@ When successful, the output of this command contains the following: We repeat these steps for the `Org2` peer. Set the following environment variables to operate the `peer` CLI as the `Org2` admin. The environment variables will also set the `Org2` peer, ``peer0.org2.example.com``, as the target peer. ``` -export CORE_PEER_LOCALMSPID="Org2MSP" +export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp export CORE_PEER_ADDRESS=localhost:9051 @@ -269,7 +269,7 @@ The endpoint information of the anchor peers of each organization is included in We will start by selecting the peer from `Org1` to be an anchor peer. The first step is to pull the most recent channel configuration block using the `peer channel fetch` command. Set the following environment variables to operate the `peer` CLI as the `Org1` admin: ``` -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 @@ -340,7 +340,7 @@ When the channel update is successful, you should see the following response: We can also set the peer from `Org2` to be an anchor peer. Because we are going through the process a second time, we will go through the steps more quickly. Set the environment variables to operate the `peer` CLI as the `Org2` admin: ``` -export CORE_PEER_LOCALMSPID="Org2MSP" +export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp export CORE_PEER_ADDRESS=localhost:9051 diff --git a/docs/source/deploy_chaincode.md b/docs/source/deploy_chaincode.md index b7437d3f066..20c37a5c833 100644 --- a/docs/source/deploy_chaincode.md +++ b/docs/source/deploy_chaincode.md @@ -376,7 +376,7 @@ Let's install the chaincode on the Org1 peer first. Set the following environmen ``` export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 @@ -398,7 +398,7 @@ If the command is successful, the peer will generate and return the package iden We can now install the chaincode on the Org2 peer. Set the following environment variables to operate as the Org2 admin and target the Org2 peer, `peer0.org2.example.com`. ``` -export CORE_PEER_LOCALMSPID="Org2MSP" +export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp export CORE_PEER_ADDRESS=localhost:9051 @@ -453,7 +453,7 @@ You need to approve a chaincode definition with an identity that has an admin ro We still need to approve the chaincode definition as Org1. Set the following environment variables to operate as the Org1 admin: ``` -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 @@ -573,7 +573,7 @@ Run the following commands to operate the `peer` CLI as the Org1 admin: ``` export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 @@ -617,7 +617,7 @@ The new chaincode definition uses the package ID of the JavaScript chaincode pac We now need to install the chaincode package and approve the chaincode definition as Org2 in order to upgrade the chaincode. Run the following commands to operate the `peer` CLI as the Org2 admin: ``` -export CORE_PEER_LOCALMSPID="Org2MSP" +export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp export CORE_PEER_ADDRESS=localhost:9051 diff --git a/docs/source/private_data_tutorial.rst b/docs/source/private_data_tutorial.rst index 6f8935118d2..51e5bf5c0fb 100644 --- a/docs/source/private_data_tutorial.rst +++ b/docs/source/private_data_tutorial.rst @@ -561,7 +561,7 @@ set of commands into your terminal in the `test-network` directory: export PATH=${PWD}/../bin:$PATH export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true - export CORE_PEER_LOCALMSPID="Org1MSP" + export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/owner@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 @@ -710,7 +710,7 @@ Run the following commands to operate as an Org2 member and query the Org2 peer. .. code:: bash - export CORE_PEER_LOCALMSPID="Org2MSP" + export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/buyer@org2.example.com/msp export CORE_PEER_ADDRESS=localhost:9051 @@ -816,7 +816,7 @@ so lets go acting as Org1: .. code:: bash - export CORE_PEER_LOCALMSPID="Org1MSP" + export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/owner@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 @@ -903,7 +903,7 @@ of Org2 and target the Org2 peer: .. code:: bash - export CORE_PEER_LOCALMSPID="Org2MSP" + export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/buyer@org2.example.com/msp export CORE_PEER_ADDRESS=localhost:9051 diff --git a/docs/source/secured_asset_transfer/secured_private_asset_transfer_tutorial.md b/docs/source/secured_asset_transfer/secured_private_asset_transfer_tutorial.md index 1c4c4e17a5c..beaaa88cf1f 100644 --- a/docs/source/secured_asset_transfer/secured_private_asset_transfer_tutorial.md +++ b/docs/source/secured_asset_transfer/secured_private_asset_transfer_tutorial.md @@ -105,7 +105,7 @@ In the course of running this sample, you need to interact with the network as b export PATH=${PWD}/../bin:${PWD}:$PATH export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:7051 @@ -121,7 +121,7 @@ Now that we have one terminal that we can operate as Org1, open a new terminal f export PATH=${PWD}/../bin:${PWD}:$PATH export FABRIC_CFG_PATH=$PWD/../config/ export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org2MSP" +export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_ADDRESS=localhost:9051 diff --git a/docs/source/test_network.md b/docs/source/test_network.md index c39e96e3663..e3fb3208462 100644 --- a/docs/source/test_network.md +++ b/docs/source/test_network.md @@ -288,7 +288,7 @@ You can now set the environment variables that allow you to operate the `peer` # Environment variables for Org1 export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org1MSP" +export CORE_PEER_LOCALMSPID=Org1MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp export CORE_PEER_ADDRESS=localhost:7051 @@ -345,7 +345,7 @@ peer. Set the following environment variables to operate as Org2: # Environment variables for Org2 export CORE_PEER_TLS_ENABLED=true -export CORE_PEER_LOCALMSPID="Org2MSP" +export CORE_PEER_LOCALMSPID=Org2MSP export CORE_PEER_TLS_ROOTCERT_FILE=${PWD}/organizations/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt export CORE_PEER_MSPCONFIGPATH=${PWD}/organizations/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp export CORE_PEER_ADDRESS=localhost:9051