Merge remote-tracking branch 'gitlab/development' into fixes

Author: sownak

platforms/hyperledger-fabric/charts/fabric-chaincode-lifecycle/templates/approve_job.yaml

@@ -19,7 +19,7 @@ metadata:
   annotations:
     helm.sh/hook-weight: "-5"
     helm.sh/hook: "pre-install,pre-upgrade"
-    helm.sh/hook-delete-policy: "before-hook-creation,hook-succeeded"
+    helm.sh/hook-delete-policy: "before-hook-creation"
 spec:
   backoffLimit: 6
   template:

platforms/hyperledger-fabric/charts/fabric-osnadmin-channel-create/templates/osn_create_channel.yaml

@@ -207,10 +207,12 @@ spec:
 
           #!/usr/bin/env sh
           echo "Format or fetch genesis file..."
+
           if [ $ADD_ORDERER = false ]
           then
             cat ./genesis/genesis.block.base64 | base64 -d > orderer.genesis.block
-          else 
+          else
+            echo "Updating orderer configs..."
             peer channel fetch config ${CHANNEL_NAME}_config_block.pb -o ${CORE_PEER_ADDRESS} -c ${CHANNEL_NAME} --tls --cafile ${ORDERER_CA}
           fi 
 

platforms/hyperledger-fabric/configuration/approve-new-organization.yaml

@@ -19,13 +19,6 @@
   gather_facts: no
   no_log: "{{ no_ansible_log | default(false) }}"
   tasks:
-
-    # delete build directory
-    - name: Remove build directory
-      file:
-        path: "./build"
-        state: absent
-
     # Generate script to modify the fetched configuration block
     - include_role:
         name: "create/new_organization/create_block"

platforms/hyperledger-fabric/configuration/roles/create/new_orderer/create_syschannel_block/templates/syschannel_update_address_script.tpl

@@ -17,7 +17,7 @@ rm -r temp
 echo "converting the channel_config_block.pb to channel_config.json using configtxlator and jq"
 configtxlator proto_decode --input {{ channel_name }}_config_block.pb --type common.Block | jq .data.data[0].payload.data.config > {{ channel_name }}_config.json
 echo "adding new organization crypto material from config.json to the channel_config.json to make channel_modified_config.json"
-jq --argjson a "$(cat ./orderer)" '.channel_group.values.OrdererAddresses.value.addresses += $a' {{ channel_name }}_config.json > {{ channel_name }}_modified_config.json
+jq --argjson a "$(cat ./orderer)" '.channel_group.groups.Orderer.values.OrdererAddresses.value.addresses += $a' {{ channel_name }}_config.json > {{ channel_name }}_modified_config.json
 echo "converting the channel_config.json and channel_modified_config.json to .pb files"
 configtxlator proto_encode --input {{ channel_name }}_config.json --type common.Config --output {{ channel_name }}_config.pb
 configtxlator proto_encode --input {{ channel_name }}_modified_config.json --type common.Config --output {{ channel_name }}_modified_config.pb

platforms/hyperledger-fabric/configuration/roles/setup/config_block/fetch/tasks/main.yaml

@@ -20,7 +20,7 @@
   loop: "{{ participants }}"
   loop_control:
     loop_var: participant
-  when: participant.type == 'creator'
+  when: participant.org_status == 'existing'
 
 # Start the cli, configure and download the configuration block
 - name: Call nested_fetch_role for the peer
@@ -37,4 +37,4 @@
   loop: "{{ participants }}"
   loop_control:
     loop_var: participantx
-  when: participantx.type == 'creator'
+  when: participantx.org_status == 'existing'

platforms/hyperledger-fabric/configuration/roles/setup/config_block/fetch/tasks/nested_fetch_role.yaml

@@ -50,8 +50,14 @@
     loop_var: org_new  
   when: org_new.org_status == 'new'
 
+# Check if channel block0 file exists
+- name: Check if the channel_block0_fetched file exists
+  stat:
+    path: "./build/{{ channel_name | lower }}_block0_fetched"
+  register: block0_file
+
 # Fetch the config block from blockchain by executing the create_block.sh script file
-# from first peer of creator cli
+# from the peer of first approving org
 - name: Fetch and copy the configuration block from the blockchain
   shell: |
     export PEER_CLI=$(KUBECONFIG={{ org.k8s.config_file }} kubectl get po -n {{ org.name }}-net | grep "cli" | head -n 1 | awk '{print $1}')
@@ -62,7 +68,9 @@
     KUBECONFIG={{ kubernetes.config_file }} kubectl exec -n {{ org.name }}-net ${PEER_CLI} -- chmod 777 ./create_block.sh
     KUBECONFIG={{ kubernetes.config_file }} kubectl exec -n {{ org.name }}-net ${PEER_CLI} --  sh ./create_block.sh
     KUBECONFIG={{ kubernetes.config_file }} kubectl cp {{ org.name }}-net/${PEER_CLI}:/opt/gopath/src/github.com/hyperledger/fabric/peer/{{ channel_name | lower }}_update_in_envelope.pb ./build/{{ channel_name | lower}}_config_block.pb
+    touch ./build/{{ channel_name | lower }}_block0_fetched
   environment:
     ORDERER_CA: "/opt/gopath/src/github.com/hyperledger/fabric/orderer/tls/orderer.crt"
   vars: 
     kubernetes: "{{ org.k8s }}"
+  when: not block0_file.stat.exists

platforms/hyperledger-fabric/configuration/roles/setup/config_block/sign_and_update/tasks/nested_update_channel.yaml

@@ -54,6 +54,13 @@
   retries: 5
   delay: 10
 
+# Delete the build folder if channel update is successful
+- name: Delete the build folder
+  ansible.builtin.file:
+    path: ./build
+    state: absent
+  when: update_channel is succeeded
+
 # Delete the cli   
 - name: "Delete cli {{ peer.name }}-{{ participant.name }}-cli"
   shell: |

platforms/shared/configuration/roles/create/job_component/templates/osn_create_channel_job.tpl

@@ -33,14 +33,16 @@ orderers:
   - name: {{ value }}
     adminAddress: {{ value }}.{{ component_ns }}:7055
 {% endif %}
+{% if key == 'ordererAddress' %}
+    ordererAddress: {{ value }}
+{% endif %}
 {% endfor %}
 {% endfor %}
 
-addOrderer: {{ add_orderer_value }}
-
-{% if add_orderer_value is defined and add_orderer_value is sameas true  %}
+{% if add_orderer_value is defined and add_orderer_value %}
 orderer:
+  addOrderer: {{ add_orderer_value }}
   name: {{ first_orderer.name }}
   localMspId: {{ org.name | lower}}MSP
-  address: {{ existingOrdererAddress }}
+  ordererAddress: {{ existingOrdererAddress }}
 {% endif %}