Skip to content

Commit

Permalink
Few vocab updates and porting the Issue 3165 changes into master (hyp…
Browse files Browse the repository at this point in the history
…erledger-archives#3405)

* vocab changes

Signed-off-by: EdProsser <[email protected]>

* 3165 change porting

Signed-off-by: EdProsser <[email protected]>
  • Loading branch information
EdProsser authored and nklincoln committed Feb 14, 2018
1 parent 00e7cd8 commit 7c5b65e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion packages/composer-website/jekylldocs/applications/web.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Below is an example using a `tutorial-network` BNA.
composer network start -a tutorial-network.bna -A admin -S adminpw -c PeerAdmin@hlfv1
```

This will create an 'admin' card for the business network, which for the above example is `[email protected]`
This will create an 'admin' card for the business network, which for the previous example is `[email protected]`

*Please note: The `admin` username and `adminpw` secret are for a specific {{site.data.conrefs.hlf_full}} identity configured for the instance of {{site.data.conrefs.hlf_full}} deployed in the Developer Tutorial. If you have configured a {{site.data.conrefs.hlf_full}} instance from scratch these identity details will be different.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ In {{site.data.conrefs.hlf_full}} {{site.data.conrefs.hlf_latest}}, peers enforc
To make that identity and its certificates available, you must create a Peer Admin business network card using the certificate and private key associated with the peer admin identity.
{{site.data.conrefs.composer_full}} provides a sample {{site.data.conrefs.hlf_full}} {{site.data.conrefs.hlf_latest}} network. The peer administrator for this network is called `PeerAdmin`, and the identity is automatically imported for you when you use the sample scripts for starting the network. Please note that the peer administrator may be given a different name for other {{site.data.conrefs.hlf_full}} networks.

**Important**: When deploying a business network to {{site.data.conrefs.hlf_full}} {{site.data.conrefs.hlf_latest}} a bootstrap registrar is defined in the {{site.data.conrefs.hlf_full}} Certificate Authority (CA) configuration. The {{site.data.conrefs.composer_full}} development environment contains a preconfigured instance of {{site.data.conrefs.hlf_full}} with a specific enrollment ID and enrollment secret for the bootstrap registrar.

## Business network administrators

When you deploy a business network, access controls are enforced as per the access control rules specified in the business network definition. Each business network must have at least one participant, and that participant must have a valid identity for accessing the business network. Otherwise, client applications cannot interact with the business network.
Expand Down Expand Up @@ -65,9 +67,9 @@ If the business network administrator has an enrollment ID and enrollment secret

## Deploying business networks using Playground locally

When deploying a business network to {{site.data.conrefs.hlf_full}} {{site.data.conrefs.hlf_latest}} using the Playground locally, you must follow the process above to connect using the peer admin identity.
**Please note**: When using a local Playground instance to deploy a business network to {{site.data.conrefs.hlf_full}} {{site.data.conrefs.hlf_latest}}, as part of the deployment process you must choose how to provide credentials for the initial business network participant. The initial participant will be a [**NetworkAdmin**](https://github.com/hyperledger/composer/blob/master/packages/composer-common/lib/system/org.hyperledger.composer.system.cto).

Identities in playground are associated with business network cards, comprising a connection profile, identity metadata, and certificates.
When deploying a business network using playground, you will be prompted to enter the credentials for the initial participant. Credentials can be provided either as a certificate or as a pre-defined enrollment ID and enrollment secret. If you are using the instance of {{site.data.conrefs.hlf_full}} set up in the {{site.data.conrefs.composer_full}} development environment, the bootstrap registrar enrollment ID is `admin` and the bootstrap registrar enrollment secret is `adminpw`. This initial participant uses the credentials set for the bootstrap registrar in the {{site.data.conrefs.hlf_full}} Certificate Authority (CA), and will be a [**NetworkAdmin**](https://github.com/hyperledger/composer/blob/master/packages/composer-common/lib/system/org.hyperledger.composer.system.cto).

When deploying a business network using Playground locally, you must have at least one business network card with the `PeerAdmin` role and at least one business network card with the `ChannelAdmin` role. Each of these business network cards must contain the correct admin certificates.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ This step gives you a local {{site.data.conrefs.hlf_full}} runtime to deploy you
curl -O https://raw.githubusercontent.com/hyperledger/composer-tools/master/packages/fabric-dev-servers/fabric-dev-servers.tar.gz
tar -xvf fabric-dev-servers.tar.gz

A `zip` is also available if you prefer: just replace the `.tar.gz` file with `fabric-dev-servers.zip` and the `tar -xvf` command with a `unzip` command in the above snippet.
A `zip` is also available if you prefer: just replace the `.tar.gz` file with `fabric-dev-servers.zip` and the `tar -xvf` command with a `unzip` command in the preceding snippet.


9. Use the scripts you just downloaded and extracted to download a local {{site.data.conrefs.hlf_full}} runtime:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ After the command has run, a business network archive file called `tutorial-netw

After creating the `.bna` file, the business network can be deployed to the instance of {{site.data.conrefs.hlf_full}}. Normally, information from the Fabric administrator is required to create a `PeerAdmin` identity, with privileges to deploy chaincode to the peer. However, as part of the development environment installation, a `PeerAdmin` identity has been created already.

After the runtime has been installed, a business network can be deployed to the peer. For best practice, a new identity should be created to administrate the business network after deployment. This identity is referred to as a network admin.
After the runtime has been installed, a business network can be deployed to the peer. For best practice, a new identity should be created to administer the business network after deployment. This identity is referred to as a network admin.

#### Retrieving the correct credentials

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ excerpt: The Playground tutorial runs through creating your first business netwo

# Playground Tutorial

In this step by step tutorial we'll walk through setting up a business network, defining our assets, participants and transactions, and testing our network by creating some participants and an asset, and submitting transactions to change the ownership of the asset from one to another.
In this step by step tutorial we'll walk through setting up a business network, defining our assets, participants and transactions, and testing our network by creating some participants and an asset, and submitting transactions to change the ownership of the asset from one to another. This tutorial is intended to act as an introduction to {{site.data.conrefs.composer_full}} concepts using the online playground environment.


## Step One: Open the {{site.data.conrefs.composer_full}} Playground

Expand Down

0 comments on commit 7c5b65e

Please sign in to comment.