From 30132ff0c324f4d9b7551c63bb9362b6e0d96bda Mon Sep 17 00:00:00 2001
From: Daniel Ananth <lca_daniel_a@yahoo.com>
Date: Wed, 18 Jul 2018 18:30:54 -0400
Subject: [PATCH] A10 ADMIN PRINCIPAL IS THE CULPRIT

---
 config-all/configtx.py |  1 +
 terraform/main.tf      | 34 +++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/config-all/configtx.py b/config-all/configtx.py
index d32f710..5b52a1e 100644
--- a/config-all/configtx.py
+++ b/config-all/configtx.py
@@ -35,6 +35,7 @@
         Name: OrdererOrg
         ID: OrdererMSP
         MSPDir: crypto-config/ordererOrganizations/example.com/msp
+        AdminPrincipal: Role.MEMBER
     - &Org1
         Name: Org1
         ID: Org1MSP
diff --git a/terraform/main.tf b/terraform/main.tf
index f9b1881..c92109b 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -40,20 +40,22 @@ resource "aws_instance" "fabric" {
     inline = [
       "sudo mount -t nfs -o nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,noresvport 192.168.1.240:/ /home/ubuntu/fabric-1.1-kafka-multi-orderer",
       "sudo chown -R ubuntu fabric-1.1-kafka-multi-orderer",
+      "source .profile",
       "git clone https://github.com/InflatibleYoshi/fabric-1.1-kafka-multi-orderer",
       "cd fabric-1.1-kafka-multi-orderer",
       "python start.py ${var.n} terraform",
-      "cd composer",
-      "chmod +x ./howtobuild.sh",
-      "./howtobuild.sh",
-      "cd ..",
-      "sudo chown -R ubuntu ../",
-      "./startFabric.sh",
-      "chmod +x createPeerAdminCard.sh",
-      "./createPeerAdminCard.sh",
-      "composer-playground",
     ]
 
+    # "cd composer",
+    # "chmod +x ./howtobuild.sh",
+    # "/howtobuild.sh",
+    # "cd ..",
+    # "sudo chown -R ubuntu ../",
+    # "/startFabric.sh",
+    # "chmod +x createPeerAdminCard.sh",
+    # "/createPeerAdminCard.sh",
+    # "composer-playground",
+
     connection {
       type = "ssh"
       user = "ubuntu"
@@ -77,14 +79,16 @@ resource "aws_instance" "fabric-peers" {
     inline = [
       "sudo mount -t nfs -o nfsvers=4.1,rsize=1048576,wsize=1048576,hard,timeo=600,retrans=2,noresvport 192.168.1.240:/ /home/ubuntu/fabric-1.1-kafka-multi-orderer",
       "sudo chown -R ubuntu fabric-1.1-kafka-multi-orderer",
-      "cd fabric-1.1-kafka-multi-orderer",
-      "chmod +x startFabric-Peer${count.index + 2}.sh",
-      "./startFabric-Peer${count.index + 2}.sh",
-      "chmod +x createPeerAdminCard.sh",
-      "./createPeerAdminCard.sh",
-      "composer-playground",
     ]
 
+    # "source .profile",
+    # "cd fabric-1.1-kafka-multi-orderer",
+    # "chmod +x startFabric-Peer${count.index + 2}.sh",
+    # "/startFabric-Peer${count.index + 2}.sh",
+    # "chmod +x createPeerAdminCard.sh",
+    # "/createPeerAdminCard.sh",
+    # "composer-playground",
+
     connection {
       type = "ssh"
       user = "ubuntu"