[FAB-4597] remove unused flags from compose files

As per CR 6757 the flag CORE_PEER_COMMITTER_LEDGER_ORDERER is no longer used also CORE_PEER_ENDORSER_ENABLED is not available. Change-Id: I50d62f234121311927ea24b9b67bd40e714bc3b8 Signed-off-by: ratnakar <[email protected]>
hyperledger · Jun 17, 2017 · 37425a1 · 37425a1
1 parent 5acdf09
commit 37425a1
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 19 deletions.
diff --git a/bddtests/dc-base.yml b/bddtests/dc-base.yml
@@ -26,7 +26,6 @@ services:
       - CORE_PEER_ID=vp0
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer1:7051
       - CORE_PEER_PROFILE_ENABLED=true
-      - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
       - CORE_PEER_MSPCONFIGPATH=${PEER0_CORE_PEER_MSPCONFIGPATH}
       - CORE_PEER_LOCALMSPID=${PEER0_CORE_PEER_LOCALMSPID}
       - CORE_PEER_TLS_CERT_FILE=${PEER0_CORE_PEER_TLS_CERT_FILE}
@@ -45,7 +44,6 @@ services:
     environment:
       - CORE_PEER_ID=vp1
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer0:7051
-      - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
       - CORE_PEER_MSPCONFIGPATH=${PEER1_CORE_PEER_MSPCONFIGPATH}
       - CORE_PEER_LOCALMSPID=${PEER1_CORE_PEER_LOCALMSPID}
       - CORE_PEER_TLS_CERT_FILE=${PEER1_CORE_PEER_TLS_CERT_FILE}
@@ -63,7 +61,6 @@ services:
     environment:
       - CORE_PEER_ID=vp2
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer3:7051
-      - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
       - CORE_PEER_MSPCONFIGPATH=${PEER2_CORE_PEER_MSPCONFIGPATH}
       - CORE_PEER_LOCALMSPID=${PEER2_CORE_PEER_LOCALMSPID}
       - CORE_PEER_TLS_CERT_FILE=${PEER2_CORE_PEER_TLS_CERT_FILE}
@@ -81,7 +78,6 @@ services:
     environment:
       - CORE_PEER_ID=vp3
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer2:7051
-      - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer0:7050
       - CORE_PEER_MSPCONFIGPATH=${PEER3_CORE_PEER_MSPCONFIGPATH}
       - CORE_PEER_LOCALMSPID=${PEER3_CORE_PEER_LOCALMSPID}
       - CORE_PEER_TLS_CERT_FILE=${PEER3_CORE_PEER_TLS_CERT_FILE}

diff --git a/bddtests/dc-peer-base.yml b/bddtests/dc-peer-base.yml
@@ -17,7 +17,6 @@ services:
       - CORE_PEER_TLS_ENABLED=true
       # This disables mutual auth for gossip
       - CORE_PEER_GOSSIP_SKIPHANDSHAKE=true
-      - CORE_PEER_ENDORSER_ENABLED=true
       - CORE_PEER_GOSSIP_ORGLEADER=false
       - CORE_PEER_GOSSIP_USELEADERELECTION=true
     ports:

diff --git a/bddtests/regression/go/ote/json2yml.js b/bddtests/regression/go/ote/json2yml.js
@@ -475,9 +475,6 @@ for ( i0=0; i0<top_key.length; i0++ ) {
                                     } else if ( lvl3_key[m] == 'CORE_PEER_NETWORKID' ) {
                                         buff = '  ' + '    - ' + lvl3_key[m] + '=' + tmp_name + '\n';
                                         fs.appendFileSync(dFile, buff);
-                                    } else if ( lvl3_key[m] == 'CORE_PEER_COMMITTER_LEDGER_ORDERER' ) {
-                                        buff = '  ' + '    - ' + lvl3_key[m] + '=' + 'orderer0' +':'+ ordererPort + '\n';
-                                        fs.appendFileSync(dFile, buff);
                                     } else if ( lvl3_key[m] == 'CORE_PEER_ADDRESS' ) {
                                         buff = '  ' + '    - ' + lvl3_key[m] + '=' + vp0Addr +':'+ tmp_port + '\n';
                                         fs.appendFileSync(dFile, buff);
@@ -602,13 +599,13 @@ for ( i0=0; i0<top_key.length; i0++ ) {
 
                         // header 4
                         for ( m=0; m< lvl3_key.length; m++ ) {
-                            if ( lvl3_key[m] == 'CORE_PEER_COMMITTER_LEDGER_ORDERER' ) {
+                            /*if ( lvl3_key[m] == 'CORE_PEER_COMMITTER_LEDGER_ORDERER' ) {
                                 buff = '  ' + '    - ' + lvl3_key[m] + '=' + 'orderer0' +':'+ ordererPort + '\n';
                                 fs.appendFileSync(dFile, buff);
-                            } else {
+                            } else {*/
                                 buff = '  ' + '    - ' + lvl3_key[m] + '=' +lvl2_obj[lvl3_key[m]] + '\n';
                                 fs.appendFileSync(dFile, buff);
-                            }
+                            //}
 
                         }
                     } else if ( ( lvl2_key[k] == 'image' ) || ( lvl2_key[k] == 'command' ) || ( lvl2_key[k] == 'working_dir' )

diff --git a/bddtests/regression/go/ote/network.json b/bddtests/regression/go/ote/network.json
@@ -89,11 +89,9 @@
                  "CORE_PEER_NETWORKID": "${CORE_PEER_ID}",
                  "CORE_PEER_ADDRESSAUTODETECT": "false",
                  "CORE_NEXT": "true",
-                 "CORE_PEER_ENDORSER_ENABLED": "true",
                  "CORE_PEER_ADDRESS": "0.0.0.0:PORTID",
                  "CORE_PEER_NETWORKID": "${CORE_PEER_NETWORKID}",
                  "CORE_PEER_COMMITTER_ENABLED": "true",
-                 "CORE_PEER_COMMITTER_LEDGER_ORDERER": "orderer:5005",
                  "CORE_PEER_PROFILE_ENABLED": "true",
                  "CORE_PEER_DISCOVERY_PERIOD": "60s",
                  "CORE_PEER_DISCOVERY_TOUCHPERIOD": "60s",
@@ -135,8 +133,6 @@
                   "CORE_LOGGING_LEVEL":"ERROR",
                   "CORE_NEXT":"true",
                   "CORE_PEER_ID":"cli",
-                  "CORE_PEER_ENDORSER_ENABLED":"true",
-                  "CORE_PEER_COMMITTER_LEDGER_ORDERER":"orderer:5005",
                   "CORE_PEER_ADDRESS":"peer0:7051"
             },
             "working_dir": "/opt/gopath/src/github.com/hyperledger/fabric/peer",

diff --git a/bddtests/regression/go/ote/ote.go b/bddtests/regression/go/ote/ote.go
@@ -1007,7 +1007,7 @@ func ote(testname string, txs int64, chans int, orderers int, ordType string, kb
 		logger(fmt.Sprintf("Using %d new channelIDs, e.g. test-chan.00023", numChannels))
 		for c := 0; c < numChannels; c++ {
 			channelIDs[c] = fmt.Sprintf("test-chan.%05d", c)
-			cmd := fmt.Sprintf("cd $GOPATH/src/github.com/hyperledger/fabric && CORE_PEER_COMMITTER_LEDGER_ORDERER=127.0.0.1:%d peer channel create -c %s", ordStartPort, channelIDs[c])
+			cmd := fmt.Sprintf("cd $GOPATH/src/github.com/hyperledger/fabric && peer channel create -c %s", channelIDs[c])
 			_ = executeCmd(cmd)
 			//executeCmdAndDisplay(cmd)
 		}

diff --git a/examples/cluster/compose/peer-base/peer-base.yaml b/examples/cluster/compose/peer-base/peer-base.yaml
@@ -12,7 +12,6 @@ services:
       - CORE_PEER_TLS_ENABLED=${TLS_ENABLED}
       - CORE_LOGGING_LEVEL=WARNING
       - CORE_NEXT=true
-      - CORE_PEER_ENDORSER_ENABLED=true
       - CORE_PEER_GOSSIP_BOOTSTRAP=peer1:7051
       - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=compose_default
     volumes:

diff --git a/examples/e2e_cli/base/peer-base.yaml b/examples/e2e_cli/base/peer-base.yaml
@@ -16,7 +16,6 @@ services:
       #- CORE_LOGGING_LEVEL=ERROR
       - CORE_LOGGING_LEVEL=DEBUG
       - CORE_PEER_TLS_ENABLED=true
-      - CORE_PEER_ENDORSER_ENABLED=true
       - CORE_PEER_GOSSIP_USELEADERELECTION=true
       - CORE_PEER_GOSSIP_ORGLEADER=false
       - CORE_PEER_PROFILE_ENABLED=true

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -31,7 +31,6 @@ vp:
     - 7053:7053
   environment:
     - CORE_PEER_ADDRESSAUTODETECT=true
-    - CORE_PEER_COMMITTER_LEDGER_ORDERER=orderer:7050
   volumes:
     - /var/run/docker.sock:/var/run/docker.sock
   command: peer node start --peer-chaincodedev