Skip to content

Commit e59cde5

Browse files
author
Tong Li
committed
[CE-332]Add connection profile and composer playground
This patch set added the function to create composer connection profile based on the fabric network configuration. It also sets up composer playground to make sure that composer playground will be working with the real fabric network, not the browser based backend. It installs the car auction business network by default, it can also install additional business networks based on bna file. Also remove few files no longer needed Change-Id: Id88ba663eba58ee990c0e5cb9346f3fa302d1f86 Signed-off-by: Tong Li <litong01@us.ibm.com>
1 parent d8624d9 commit e59cde5

File tree

16 files changed

+321
-241
lines changed

16 files changed

+321
-241
lines changed

src/agent/ansible/roles/deploy_compose/certgen/tasks/apply.yml

Lines changed: 0 additions & 160 deletions
This file was deleted.

src/agent/ansible/roles/deploy_compose/certgen/tasks/destroy.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/agent/ansible/roles/deploy_compose/certgen/templates/crypto-config.j2

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/agent/ansible/roles/deploy_compose/certsetup/tasks/apply.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,51 @@
100100
- "peerOrganizations"
101101
- "ordererOrganizations"
102102

103+
- name: Create connection profiles
104+
template:
105+
src: "{{ playbook_dir }}/../deploy_compose/certsetup/templates/connection.j2"
106+
dest: "{{ fabricworkdir }}/keyfiles/{{ item }}/connection.json"
107+
with_items: "{{ allorgs }}"
108+
tags: "composer"
109+
110+
- name: Create endorsement policy file
111+
template:
112+
src: "{{ playbook_dir }}/../deploy_compose/certsetup/templates/policy.j2"
113+
dest: "{{ fabricworkdir }}/keyfiles/policy.json"
114+
tags: "composer"
115+
116+
- name: Rename admin private key
117+
shell: >-
118+
ls | cat -n | while read n f; do mv "$f" "admin_private.key"; done
119+
args:
120+
chdir: "{{ fabricworkdir }}/keyfiles/{{ item }}/users/Admin@{{ item }}/msp/keystore"
121+
with_items: "{{ allorgs }}"
122+
tags: "composer"
123+
124+
- name: Rename ca private key
125+
shell: >-
126+
ls *_sk|cat -n|while read n f; do mv "$f" "ca_private.key"; done
127+
args:
128+
chdir: "{{ fabricworkdir }}/keyfiles/{{ item }}/ca"
129+
with_items: "{{ allorgs }}"
130+
tags: "composer"
131+
132+
- name: Rename ca tls private key
133+
shell: >-
134+
ls *_sk|cat -n|while read n f; do mv "$f" "tlsca_private.key"; done
135+
args:
136+
chdir: "{{ fabricworkdir }}/keyfiles/{{ item }}/tlsca"
137+
with_items: "{{ allorgs }}"
138+
tags: "composer"
139+
140+
- name: Upload bna file
141+
copy:
142+
src: "{{ item }}"
143+
dest: "{{ fabricworkdir }}/keyfiles/"
144+
with_fileglob:
145+
- "{{ playbook_dir }}/../../secrets/networks/*.bna"
146+
tags: "composer"
147+
103148
- name: Create core.yml file for every peer
104149
template:
105150
src: "{{ playbook_dir }}/../deploy_compose/certsetup/templates/core.j2"
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{
2+
"name": "{{ item }}-network",
3+
"x-type": "hlfv1",
4+
"version": "1.0.0",
5+
"client": {
6+
"organization": "{{ item }}",
7+
"connection": {
8+
"timeout": {
9+
"peer": { "endorser": "300", "eventHub": "300", "eventReg": "300"},
10+
"orderer": "300"
11+
}
12+
}
13+
},
14+
"channels": {
15+
"firstchannel": {
16+
"orderers": [
17+
{% for orderer in orderers %}
18+
"{{ orderer.name }}"{{ '' if loop.last else ',' }}
19+
{% endfor %}
20+
],
21+
"peers": {
22+
{% for peer in peers %}
23+
"{{ peer.name }}": {
24+
"endorsingPeer": true, "chaincodeQuery": true, "eventSource": true
25+
}{{ '' if loop.last else ',' }}
26+
{% endfor %}
27+
}
28+
}
29+
},
30+
"organizations": {
31+
{% for org in allorgs %}
32+
"{{ org }}": {
33+
"mspid": "{{ org }}",
34+
"peers": [
35+
{% for peer in peers|selectattr('org', 'equalto', org)|list %}
36+
"{{ peer.name }}"{{ '' if loop.last else ',' }}
37+
{% endfor %}
38+
],
39+
"certificateAuthorities": [
40+
{% for ca in cas|selectattr('org', 'equalto', org)|list %}
41+
"{{ ca.name }}"{{ '' if loop.last else ',' }}
42+
{% endfor %}
43+
]
44+
}{{ '' if loop.last else ',' }}
45+
{% endfor %}
46+
},
47+
"orderers": {
48+
{% for orderer in orderers %}
49+
"{{ orderer.name }}": {
50+
"url": "{{ fabric.tls|ternary('grpcs','grpc') }}://{{ orderer.name }}:7050",
51+
"grpcOptions": {
52+
"ssl-target-name-override": "{{ orderer.name }}"
53+
},
54+
"tlsCACerts": {
55+
"pem": "{{ fabricworkdir+'/run/keyfiles/'+orderer.org+'/orderers/'+orderer.name+'.'+orderer.org+'/tls/ca.crt' }}"
56+
}
57+
}{{ '' if loop.last else ',' }}
58+
{% endfor %}
59+
},
60+
"peers": {
61+
{% for peer in peers %}
62+
"{{ peer.name }}": {
63+
"url": "{{ fabric.tls|ternary('grpcs','grpc') }}://{{ peer.name }}:7051",
64+
"eventUrl": "{{ fabric.tls|ternary('grpcs','grpc') }}://{{ peer.name }}:7053",
65+
"grpcOptions": {
66+
"ssl-target-name-override": "{{ peer.name }}"
67+
},
68+
"tlsCACerts": {
69+
"pem": "{{ fabricworkdir+'/run/keyfiles/'+peer.org+'/tlsca/tlsca.'+peer.org+'-cert.pem' }}"
70+
}
71+
}{{ '' if loop.last else ',' }}
72+
{% endfor %}
73+
},
74+
"certificateAuthorities": {
75+
{% for ca in cas %}
76+
"{{ ca.name }}": {
77+
"url": "{{ fabric.tls|ternary('https','http') }}://{{ca.name}}:7054",
78+
"caName": "{{ ca.name }}",
79+
"httpOptions": {"verify": false}
80+
}{{ '' if loop.last else ',' }}
81+
{% endfor %}
82+
}
83+
}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"identities": [
3+
{% for org in peerorgs %}
4+
{"role": { "name": "member", "mspId": "{{ org }}" } }{{ '' if loop.last else ',' }}
5+
{% endfor %}
6+
],
7+
"policy": {
8+
"{{ peerorgs | length }}-of": [
9+
{% for org in peerorgs %}
10+
{"signed-by": {{ loop.index0 }} }{{ '' if loop.last else ',' }}
11+
{% endfor %}
12+
]
13+
}
14+
}

0 commit comments

Comments
 (0)