[FAB-3740] Fix dev mode instructions

The dev mode instructions have been broken since the channel creation
policy controls were put in place.

This CR adds an appropriate configuration definition for the orderer
bootstrap for dev mode, and updates the docs to start the orderer using
this new configuration.

Change-Id: If3d0cf78de50e1a4a684c696f7a0c6e8f30eafc2
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>

docs/source/peer-chaincode-devmode.rst

@@ -18,10 +18,12 @@ Start the orderer
 
 ::
 
-    orderer
+    ORDERER_GENERAL_GENESISPROFILE=SampleDevModeSolo orderer
 
-The above starts the orderer in the local environment using default
-orderer configuration as defined in ``sampleconfig/orderer.yaml``.
+The above starts the orderer in the local environment the orderer
+configuration as defined in ``sampleconfig/orderer.yaml`` with the
+genesisprofile directive overridden to use the SampleDevModeSolo profile
+for bootstrapping the network.
 
 Start the peer in dev mode
 --------------------------

sampleconfig/configtx.yaml

@@ -37,6 +37,21 @@ Profiles:
             SampleConsortium:
                 Organizations:
 
+    # SampleDevModeSolo defines a configuration which uses the Solo orderer,
+    # contains the sample MSP as both orderer and consortium member, and
+    # requires only basic membership for admin privileges
+    SampleDevModeSolo:
+        Orderer:
+            <<: *OrdererDefaults
+            Organizations:
+                - <<: *SampleOrg
+                  AdminPrincipal: Role.MEMBER
+        Consortiums:
+            SampleConsortium:
+                Organizations:
+                    - <<: *SampleOrg
+                      AdminPrincipal: Role.MEMBER
+
     # SampleSingleMSPSolo defines a configuration which uses the Solo orderer,
     # and contains a single MSP definition (the MSP sampleconfig).
     # The Consortium SampleConsortium has only a single member, SampleOrg