A??? we're going into hyperspace

blockchainfellow · Jul 20, 2018 · adbbc55 · adbbc55
1 parent 76f9c6f
commit adbbc55
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 21 deletions.
diff --git a/composer/docker-compose.yml b/composer/docker-compose.yml
@@ -190,7 +190,7 @@ services:
     image: hyperledger/fabric-kafka
     restart: always
     environment:
-      - KAFKA_ADVERTISED_HOST_NAME=kafka0
+      - KAFKA_ADVERTISED_HOST_NAME={IP-HOST-1}
       - KAFKA_MESSAGE_MAX_BYTES=103809024
       - KAFKA_REPLICA_FETCH_MAX_BYTES=103809024 
       - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false
@@ -212,7 +212,7 @@ services:
     image: hyperledger/fabric-kafka
     restart: always
     environment:
-      - KAFKA_ADVERTISED_HOST_NAME=kafka1
+      - KAFKA_ADVERTISED_HOST_NAME={IP-HOST-1}
       - KAFKA_MESSAGE_MAX_BYTES=103809024
       - KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
       - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false
@@ -234,7 +234,7 @@ services:
     image: hyperledger/fabric-kafka
     restart: always
     environment:
-      - KAFKA_ADVERTISED_HOST_NAME=kafka2
+      - KAFKA_ADVERTISED_HOST_NAME={IP-HOST-1}
       - KAFKA_MESSAGE_MAX_BYTES=103809024
       - KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
       - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false
@@ -256,7 +256,7 @@ services:
     image: hyperledger/fabric-kafka
     restart: always
     environment:
-      - KAFKA_ADVERTISED_HOST_NAME=kafka3
+      - KAFKA_ADVERTISED_HOST_NAME={IP-HOST-1}
       - KAFKA_MESSAGE_MAX_BYTES=103809024
       - KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
       - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false

diff --git a/config-all/docker-compose-peer-n.py b/config-all/docker-compose-peer-n.py
@@ -37,10 +37,10 @@
         - ./crypto-config/ordererOrganizations/example.com/orderers/orderer""" + str(i + 1) + """.example.com/msp:/etc/hyperledger/msp/orderer/msp
         - ./crypto-config/ordererOrganizations/example.com/orderers/orderer""" + str(i + 1) + """.example.com/tls:/etc/hyperledger/tls/orderer/tls
     depends_on:
-      - kafka0
-      - kafka1
-      - kafka2
-      - kafka3
+      - kafka""" + str(4*i + 4) + """
+      - kafka""" + str(4*i + 5) + """
+      - kafka""" + str(4*i + 6) + """
+      - kafka""" + str(4*i + 7) + """
 
   peer""" + str(2 + (i*2)) + """.org1.example.com:
     container_name: peer""" + str(2 + (i*2)) + """.org1.example.com
@@ -140,7 +140,7 @@
     image: hyperledger/fabric-kafka
     restart: always
     environment:
-      - KAFKA_ADVERTISED_HOST_NAME=kafka""" + str(4*i + 4) + """
+      - KAFKA_ADVERTISED_HOST_NAME={IP-HOST-""" + str(i + 2) + """}
       - KAFKA_MESSAGE_MAX_BYTES=103809024
       - KAFKA_REPLICA_FETCH_MAX_BYTES=103809024 
       - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false
@@ -158,7 +158,7 @@
     image: hyperledger/fabric-kafka
     restart: always
     environment:
-      - KAFKA_ADVERTISED_HOST_NAME=kafka""" + str(4*i + 5) + """
+      - KAFKA_ADVERTISED_HOST_NAME={IP-HOST-""" + str(i + 2) + """}
       - KAFKA_MESSAGE_MAX_BYTES=103809024
       - KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
       - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false
@@ -176,7 +176,7 @@
     image: hyperledger/fabric-kafka
     restart: always
     environment:
-      - KAFKA_ADVERTISED_HOST_NAME=kafka""" + str(4*i + 6) + """
+      - KAFKA_ADVERTISED_HOST_NAME={IP-HOST-""" + str(i + 2) + """}
       - KAFKA_MESSAGE_MAX_BYTES=103809024
       - KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
       - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false
@@ -194,7 +194,7 @@
     image: hyperledger/fabric-kafka
     restart: always
     environment:
-      - KAFKA_ADVERTISED_HOST_NAME=kafka""" + str(4*i + 7) + """
+      - KAFKA_ADVERTISED_HOST_NAME={IP-HOST-""" + str(i + 2) + """}
       - KAFKA_MESSAGE_MAX_BYTES=103809024
       - KAFKA_REPLICA_FETCH_MAX_BYTES=103809024
       - KAFKA_UNCLEAN_LEADER_ELECTION_ENABLE=false

diff --git a/config-all/howtobuild.py b/config-all/howtobuild.py
@@ -21,6 +21,7 @@
 
 for i in range(arg1):
     PEERNUMBER += 'sed -i -e "s/{IP-HOST-1}/$HOST1/g" docker-compose-peer' + str(i+2) + '.yaml\n'
+    PEERNUMBER += 'sed -i -e "s/{IP-HOST-' + str(i+2) + '}/$HOST' + str(i+2) + '/g" docker-compose-peer' + str(i+2) + '.yaml\n'
 
 for i in range(arg1):
     PEERADMINCARD += 'sed -i -e "s/{IP-HOST-' + str(i+2) + '}/$HOST' + str(i+2) + '/g" ../createPeerAdminCard.sh\n'

diff --git a/config-all/startFabric-peer-n.py b/config-all/startFabric-peer-n.py
@@ -40,19 +40,12 @@
 echo ${FABRIC_START_TIMEOUT}
 sleep ${FABRIC_START_TIMEOUT}
 
-docker exec peer""" + str(i + 2) + """.org1.example.com peer channel create -o orderer""" + str(i + 1) + """.example.com:7050 -c composerchannel -f /etc/hyperledger/configtx/composer-channel.tx --tls --cafile /etc/hyperledger/msp/orderer/msp/tlscacerts/tlsca.example.com-cert.pem
+docker exec -e "CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/users/Admin@org1.example.com/msp" peer""" + str(i + 2) + """.org1.example.com peer channel fetch config -o orderer0.example.com:7050 -c composerchannel --tls --cafile /etc/hyperledger/msp/orderer/msp/tlscacerts/tlsca.example.com-cert.pem
 
-echo ${FABRIC_START_TIMEOUT}
-sleep ${FABRIC_START_TIMEOUT}
-sleep ${FABRIC_START_TIMEOUT}
-
-# Join peer0.org1.example.com to the channel.
 docker exec -e "CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/users/Admin@org1.example.com/msp" peer""" + str(i + 2) + """.org1.example.com peer channel join -b composerchannel.block --tls --cafile /etc/hyperledger/msp/orderer/msp/tlscacerts/tlsca.example.com-cert.pem
 
-# # Create the channel
-docker exec -e "CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/users/Admin@org1.example.com/msp" peer""" + str(i + 3) + """.org1.example.com peer channel fetch config -o orderer""" + str(i + 1) + """.example.com:7050 -c composerchannel --tls --cafile /etc/hyperledger/msp/orderer/msp/tlscacerts/tlsca.example.com-cert.pem
+docker exec -e "CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/users/Admin@org1.example.com/msp" peer""" + str(i + 3) + """.org1.example.com peer channel fetch config -o orderer0.example.com:7050 -c composerchannel --tls --cafile /etc/hyperledger/msp/orderer/msp/tlscacerts/tlsca.example.com-cert.pem
 
-# # Join peer""" + str(i + 3) + """.org1.example.com to the channel.
 docker exec -e "CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/users/Admin@org1.example.com/msp" peer""" + str(i + 3) + """.org1.example.com peer channel join -b composerchannel_config.block --tls --cafile /etc/hyperledger/msp/orderer/msp/tlscacerts/tlsca.example.com-cert.pem
 """