core.yaml MSPCONFIGPATH to def. to msp/sampleconfig

https://jira.hyperledger.org/browse/FAB-1873

sets MSPCONFIGPATH to the right default so non-docker envs will run.
"peer" commands should be run from the directory which resolves
"./msp/.." correctly. In standard fabric envs this should be "fabric/"
directory

Change-Id: I2af634baef3f82c8c93748f73d17ced18031496c
Signed-off-by: Srinivasan Muralidharan <muralisr@us.ibm.com>

docs/docker-compose-channel.yml

@@ -36,6 +36,7 @@ services:
       - CORE_PEER_PROFILE_ENABLED=true
       - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer:5005
       - CORE_PEER_GOSSIP_ORGLEADER=true
+      - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp/sampleconfig
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
     ports:
       - 7051:7051
@@ -64,6 +65,7 @@ services:
       - CORE_PEER_ENDORSER_ENABLED=true
       - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer:5005
       - CORE_PEER_ADDRESS=peer0:7051
+      - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp/sampleconfig
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
     command: /bin/sh
     links:

peer/core.yaml

@@ -149,7 +149,7 @@ peer:
     fileSystemPath: /var/hyperledger/production
 
     # Path on the file system where peer will find MSP local configurations
-    mspConfigPath: /etc/hyperledger/fabric/msp/sampleconfig
+    mspConfigPath: msp/sampleconfig
 
     # Used with Go profiling tools only in none production environment. In
     # production, it should be disabled (eg enabled: false)

unit-test/docker-compose.yml

@@ -5,6 +5,7 @@ vp:
     - 7051
   environment:
     - CORE_PEER_ADDRESSAUTODETECT=true
+    - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp/sampleconfig
   volumes:
     - /var/run/docker.sock:/var/run/docker.sock