[FAB-923] Change orderer listener port

standardize orderer listener port to 7050 side change: add etc/hyperledger/fabric to viper config paths patchset 2: fix up Dockerfile for image as well Change-Id: Ib389771e3a4d24ad0f995239c0b98b71b6a7a3bd Signed-off-by: tuand27613 <tdang@us.ibm.com>
hyperledger · Nov 21, 2016 · 2e1e2cb · 2e1e2cb
1 parent ae4b3ae
commit 2e1e2cb
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/bddtests/docker-compose-orderer-base.yml b/bddtests/docker-compose-orderer-base.yml
@@ -6,7 +6,6 @@ ordererBase:
         - ORDERER_GENERAL_BATCHSIZE=10
         - ORDERER_GENERAL_MAXWINDOWSIZE=1000
         - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
-        - ORDERER_GENERAL_LISTENPORT=5005
         - ORDERER_RAMLEDGER_HISTORY_SIZE=100
     working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer
     command: orderer
diff --git a/bddtests/steps/orderer_util.py b/bddtests/steps/orderer_util.py
@@ -237,6 +237,6 @@ def generateBroadcastMessages(numToGenerate = 1, timeToHoldOpen = 1):
 
 
 def getGRPCChannel(ipAddress):
-    channel = implementations.insecure_channel(ipAddress, 5005)
+    channel = implementations.insecure_channel(ipAddress, 7050)
     print("Returning GRPC for address: {0}".format(ipAddress))
     return channel
diff --git a/images/orderer/Dockerfile.in b/images/orderer/Dockerfile.in
@@ -3,5 +3,5 @@ RUN mkdir -p /var/hyperledger/db /etc/hyperledger/fabric
 COPY payload/orderer /usr/local/bin
 COPY payload/orderer.yaml /etc/hyperledger/fabric
 WORKDIR /etc/hyperledger/fabric
-EXPOSE 5151
+EXPOSE 7050
 CMD orderer
diff --git a/orderer/config/config.go b/orderer/config/config.go
@@ -104,7 +104,7 @@ var defaults = TopLevel{
 		QueueSize:     1000,
 		MaxWindowSize: 1000,
 		ListenAddress: "127.0.0.1",
-		ListenPort:    5151,
+		ListenPort:    7050,
 		GenesisMethod: "static",
 		Profile: Profile{
 			Enabled: false,
@@ -203,6 +203,7 @@ func Load() *TopLevel {
 	config.AddConfigPath("../../.")
 	config.AddConfigPath("../orderer/")
 	config.AddConfigPath("../../orderer/")
+	config.AddConfigPath("/etc/hyperledger/fabric/")
 	// Path to look for the config file in based on GOPATH
 	gopath := os.Getenv("GOPATH")
 	for _, p := range filepath.SplitList(gopath) {

diff --git a/orderer/kafka/config_test.go b/orderer/kafka/config_test.go
@@ -44,7 +44,7 @@ var testConf = &config.TopLevel{
 		QueueSize:     100,
 		MaxWindowSize: 100,
 		ListenAddress: "127.0.0.1",
-		ListenPort:    5151,
+		ListenPort:    7050,
 	},
 	Kafka: config.Kafka{
 		Brokers:     []string{"127.0.0.1:9092"},

diff --git a/orderer/orderer.yaml b/orderer/orderer.yaml
@@ -35,7 +35,7 @@ General:
     ListenAddress: 127.0.0.1
 
     # Listen port: The port on which to bind to listen
-    ListenPort: 5151
+    ListenPort: 7050
 
     # Genesis method: The method by which to retrieve/generate the genesis block
     GenesisMethod: static

diff --git a/orderer/sample_clients/bd_counter/main.go b/orderer/sample_clients/bd_counter/main.go
@@ -54,7 +54,7 @@ func main() {
 	flag.StringVar(&client.config.rpc, "rpc", "broadcast",
 		"The RPC that this client is requesting.")
 	flag.StringVar(&client.config.server, "server",
-		"127.0.0.1:5151", "The RPC server to connect to.")
+		"127.0.0.1:7050", "The RPC server to connect to.")
 	flag.IntVar(&client.config.count, "count", 100,
 		"When in broadcast mode, how many messages to send.")
 	flag.StringVar(&loglevel, "loglevel", "info",