Merge "[CE-478]adding missing connection profile fields"

hyperledger · Sep 17, 2018 · 1b4f305 · 1b4f305
2 parents d128008 + fd08855
commit 1b4f305
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/agent/ansible/roles/deploy_compose/certsetup/tasks/apply.yml b/src/agent/ansible/roles/deploy_compose/certsetup/tasks/apply.yml
@@ -48,7 +48,7 @@
 
 - name: Rename admin private key
   shell: >-
-    ls *_sk | cat -n | while read n f; do mv "$f" "admin_private.key"; done
+    ls *_sk | cat -n | while read n f; do cp "$f" "admin_private.key"; done
   args:
     chdir: "{{ fabricworkdir }}/keyfiles/{{ item }}/users/Admin@{{ item }}/msp/keystore"
   with_items: "{{ allorgs }}"

diff --git a/src/agent/ansible/roles/deploy_compose/certsetup/templates/connyaml.j2 b/src/agent/ansible/roles/deploy_compose/certsetup/templates/connyaml.j2
@@ -4,6 +4,8 @@ x-type: "hlfv1"
 version: "1.0.0"
 client:
   organization: "{{ item }}"
+  cryptoconfig:
+    path: "/fabric/keyfiles"
   connection:
     timeout:
       peer:
@@ -28,6 +30,7 @@ organizations:
 {% for org in allorgs %}
   {{ org }}:
     mspid: "{{ org }}"
+    cryptoPath: "{{ org }}/users/{username}@{{ org}}/msp"
     peers:
 {% for peer in allpeers|selectattr('org', 'equalto', org)|list %}
       - {{ peer.name }}
@@ -63,4 +66,6 @@ certificateAuthorities:
     caName: "{{ ca.name }}"
     httpOptions:
       verify: false
+    tlsCACerts:
+      path: "{{ '/fabric/keyfiles/'+ca.org+'/tlsca/tlsca.'+ca.org+'-cert.pem' }}"
 {% endfor %}