Merge pull request #142 from sstone1/issue-141

Simon Stone · web-flow · commit e76d8458a90a · 2020-02-06T11:30:49.000Z
Add wallet/identity properties to IBP SaaS/software node files (resolves #141)
diff --git a/templates/saas/ca-node.json.j2 b/templates/saas/ca-node.json.j2
@@ -11,5 +11,7 @@
     "tlsca_name": "{{ ibp[ca.id].tlscaname }}",
     {% endif %}
     "type": "fabric-ca",
-    "msp_id": "{{ organization.msp.id }}"
+    "msp_id": "{{ organization.msp.id }}",
+    "wallet": "{{ organization.wallet | basename }}",
+    "identity": "{{ organization.ca.admin_identity }}"
 }
diff --git a/templates/saas/orderer-node.json.j2 b/templates/saas/orderer-node.json.j2
@@ -7,5 +7,7 @@
     "pem": "{{ lookup('file', ibp[orderer.id].pem) | b64encode }}",
     {% endif %}
     "type": "fabric-orderer",
-    "msp_id": "{{ organization.msp.id }}"
+    "msp_id": "{{ organization.msp.id }}",
+    "wallet": "{{ organization.wallet | basename }}",
+    "identity": "{{ organization.msp.admin.identity }}"
 }
diff --git a/templates/saas/peer-node.json.j2 b/templates/saas/peer-node.json.j2
@@ -7,5 +7,7 @@
     "pem": "{{ lookup('file', ibp[peer.id].pem) | b64encode }}",
     {% endif %}
     "type": "fabric-peer",
-    "msp_id": "{{ organization.msp.id }}"
+    "msp_id": "{{ organization.msp.id }}",
+    "wallet": "{{ organization.wallet | basename }}",
+    "identity": "{{ organization.msp.admin.identity }}"
 }
diff --git a/templates/software/ca-node.json.j2 b/templates/software/ca-node.json.j2
@@ -11,5 +11,7 @@
     "tlsca_name": "{{ ibp[ca.id].tlscaname }}",
     {% endif %}
     "type": "fabric-ca",
-    "msp_id": "{{ organization.msp.id }}"
+    "msp_id": "{{ organization.msp.id }}",
+    "wallet": "{{ organization.wallet | basename }}",
+    "identity": "{{ organization.ca.admin_identity }}"
 }
diff --git a/templates/software/orderer-node.json.j2 b/templates/software/orderer-node.json.j2
@@ -7,5 +7,7 @@
     "pem": "{{ lookup('file', ibp[orderer.id].pem) | b64encode }}",
     {% endif %}
     "type": "fabric-orderer",
-    "msp_id": "{{ organization.msp.id }}"
+    "msp_id": "{{ organization.msp.id }}",
+    "wallet": "{{ organization.wallet | basename }}",
+    "identity": "{{ organization.msp.admin.identity }}"
 }
diff --git a/templates/software/peer-node.json.j2 b/templates/software/peer-node.json.j2
@@ -7,5 +7,7 @@
     "pem": "{{ lookup('file', ibp[peer.id].pem) | b64encode }}",
     {% endif %}
     "type": "fabric-peer",
-    "msp_id": "{{ organization.msp.id }}"
+    "msp_id": "{{ organization.msp.id }}",
+    "wallet": "{{ organization.wallet | basename }}",
+    "identity": "{{ organization.msp.admin.identity }}"
 }

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,7 @@`
`11`	`11`	`"tlsca_name": "{{ ibp[ca.id].tlscaname }}",`
`12`	`12`	`{% endif %}`
`13`	`13`	`"type": "fabric-ca",`
`14`		`- "msp_id": "{{ organization.msp.id }}"`
	`14`	`+ "msp_id": "{{ organization.msp.id }}",`
	`15`	`+ "wallet": "{{ organization.wallet \| basename }}",`
	`16`	`+ "identity": "{{ organization.ca.admin_identity }}"`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,7 @@`
`7`	`7`	`"pem": "{{ lookup('file', ibp[orderer.id].pem) \| b64encode }}",`
`8`	`8`	`{% endif %}`
`9`	`9`	`"type": "fabric-orderer",`
`10`		`- "msp_id": "{{ organization.msp.id }}"`
	`10`	`+ "msp_id": "{{ organization.msp.id }}",`
	`11`	`+ "wallet": "{{ organization.wallet \| basename }}",`
	`12`	`+ "identity": "{{ organization.msp.admin.identity }}"`
`11`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,7 @@`
`7`	`7`	`"pem": "{{ lookup('file', ibp[peer.id].pem) \| b64encode }}",`
`8`	`8`	`{% endif %}`
`9`	`9`	`"type": "fabric-peer",`
`10`		`- "msp_id": "{{ organization.msp.id }}"`
	`10`	`+ "msp_id": "{{ organization.msp.id }}",`
	`11`	`+ "wallet": "{{ organization.wallet \| basename }}",`
	`12`	`+ "identity": "{{ organization.msp.admin.identity }}"`
`11`	`13`	`}`