Minor fixes for tutorial names (#246)

Signed-off-by: m-g-k <[email protected]>

tutorial/01-create-ordering-organization-components.yml

@@ -8,18 +8,18 @@
     state: present
     organization_name: "{{ ordering_org_name }}"
     organization_msp_id: "{{ ordering_service_msp }}"
-    ca_admin_enrollment_id: "{{ ca_admin_enrollment_id }}"
-    organization_admin_enrollment_id: "{{ organization_admin_enrollment_id }}"
-    ordering_service_enrollment_id: "{{ ordering_service_enrollment_id }}"
-    ordering_service_name: "{{ ordering_service_name }}"
-    ordering_service_nodes: "{{ ordering_service_nodes }}"
-    # These variables should be supplied using --extra-vars "@ordering-org-vars.yml"
+    # These variables should be supplied using --extra-vars "@ordering-org-vars.yml" --extra-vars "@common-vars.yml"
     # api_endpoint: https://ibp-console.example.org:32000
     # api_authtype: basic
     # api_key: xxxxxxxx
     # api_secret: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+    # ca_admin_enrollment_id: admin
     # ca_admin_enrollment_secret: adminpw
+    # organization_admin_enrollment_id: orderingorgadmin
     # organization_admin_enrollment_secret: orderingorgadminpw
+    # ordering_service_enrollment_id: orderingorgorderer
     # ordering_service_enrollment_secret: orderingorgordererpw
+    # ordering_service_name: Ordering Service
+    # ordering_service_nodes: 1
   roles:
     - ibm.blockchain_platform.ordering_organization

tutorial/02-create-endorsing-organization-components.yml

@@ -8,18 +8,18 @@
     state: present
     organization_name: "{{ org1_name }}"
     organization_msp_id: "{{ org1_msp_id }}"
-    ca_admin_enrollment_id: "{{ ca_admin_enrollment_id }}"
-    organization_admin_enrollment_id: "{{ organization_admin_enrollment_id }}"
-    peer_enrollment_id: "{{ peer_enrollment_id }}"
     ca_name: "{{ org1_ca_name }}"
     peer_name: "{{ org1_peer_name }}"
     # These variables should be supplied using --extra-vars "@org1-vars.yml"
     # api_endpoint: https://ibp-console.example.org:32000
     # api_authtype: basic
     # api_key: xxxxxxxx
     # api_secret: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+    # ca_admin_enrollment_id: admin
     # ca_admin_enrollment_secret: adminpw
+    # organization_admin_enrollment_id: org1admin
     # organization_admin_enrollment_secret: org1adminpw
+    # peer_enrollment_id: org1peer
     # peer_enrollment_secret: org1peerpw
   roles:
     - ibm.blockchain_platform.endorsing_organization

tutorial/11-create-endorsing-organization-components.yml

@@ -8,18 +8,18 @@
     state: present
     organization_name: "{{ org2_name }}"
     organization_msp_id: "{{ org2_msp_id }}"
-    ca_admin_enrollment_id: "{{ ca_admin_enrollment_id }}"
-    organization_admin_enrollment_id: "{{ organization_admin_enrollment_id }}"
-    peer_enrollment_id: "{{ peer_enrollment_id }}"
     ca_name: "{{ org2_ca_name }}"
     peer_name: "{{ org2_peer_name }}"
     # These variables should be supplied using --extra-vars "@org2-vars.yml"
     # api_endpoint: https://ibp-console.example.org:32000
     # api_authtype: basic
     # api_key: xxxxxxxx
     # api_secret: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+    # ca_admin_enrollment_id: admin
     # ca_admin_enrollment_secret: adminpw
+    # organization_admin_enrollment_id: org2admin
     # organization_admin_enrollment_secret: org2adminpw
+    # peer_enrollment_id: org2peer
     # peer_enrollment_secret: org2peerpw
   roles:
     - ibm.blockchain_platform.endorsing_organization

tutorial/18-install-chaincode.yml

@@ -21,4 +21,4 @@
         peer: "{{ org1_peer_name }}"
         identity: "{{ org1_name }} Admin.json"
         msp_id: "{{ org1_msp_id }}"
-        path: "{{ smart_contract_base_name }}@{{ smart_contract_version }}.cds"
+        path: "{{ smart_contract_package }}"

tutorial/19-install-chaincode.yml

@@ -21,4 +21,4 @@
         peer: "{{ org2_peer_name }}"
         identity: "{{ org2_name }} Admin.json"
         msp_id: "{{ org2_msp_id }}"
-        path: "{{ smart_contract_base_name }}@{{ smart_contract_version }}.cds"
+        path: "{{ smart_contract_package }}"

tutorial/20-instantiate-chaincode.yml

@@ -22,7 +22,7 @@
         identity: "{{ org1_name }} Admin.json"
         msp_id: "{{ org1_msp_id }}"
         channel: "{{ channel_name }}"
-        name: "{{ smart_contract_base_name }}"
+        name: "{{ smart_contract_name }}"
         constructor:
           function: "{{ smart_contract_constructor | default(omit) }}"
         version: "{{ smart_contract_version }}"

tutorial/21-register-application.yml

@@ -26,7 +26,7 @@
         max_enrollments: "{{ application_max_enrollments }}"
         type: "{{ application_enrollment_type }}"
         attributes:
-          - name: "{{ smart_contract_base_name }}.admin"
+          - name: "{{ smart_contract_name }}.admin"
             value: "true"
 
     - name: Create a connection profile

tutorial/22-register-application.yml

@@ -26,7 +26,7 @@
         max_enrollments: "{{ application_max_enrollments }}"
         type: "{{ application_enrollment_type }}"
         attributes:
-          - name: "{{ smart_contract_base_name }}.admin"
+          - name: "{{ smart_contract_name }}.admin"
             value: "true"
 
     - name: Create a connection profile

tutorial/97-delete-endorsing-organization-components.yml

@@ -7,6 +7,8 @@
   vars:
     state: absent
     organization_name: "{{ org1_name }}"
+    ca_name: "{{ org1_ca_name }}"
+    peer_name: "{{ org1_peer_name }}"
     # These variables should be supplied using --extra-vars "@org1-vars.yml"
     # api_endpoint: https://ibp-console.example.org:32000
     # api_authtype: basic

tutorial/98-delete-endorsing-organization-components.yml

@@ -7,6 +7,8 @@
   vars:
     state: absent
     organization_name: "{{ org2_name }}"
+    ca_name: "{{ org2_ca_name }}"
+    peer_name: "{{ org2_peer_name }}"
     # These variables should be supplied using --extra-vars "@org2-vars.yml"
     # api_endpoint: https://ibp-console.example.org:32000
     # api_authtype: basic

tutorial/common-vars.yml

@@ -11,8 +11,9 @@ org1_msp_id: Org1MSP
 org2_name: "Org2"
 org2_msp_id: Org2MSP
 channel_name: "mychannel"
-smart_contract_base_name: "fabcar"
+smart_contract_name: "fabcar"
 smart_contract_version: "1.0.0"
+smart_contract_package: "[email protected]"
 # smart_contract_constructor: "initLedger"
 # smart_contract_endorsement_policy: ""
 # smart_contract_collections_file: ""

tutorial/org1-vars.yml

@@ -8,7 +8,7 @@ api_key: xxxxxxxx
 api_secret: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ca_admin_enrollment_id: admin
 ca_admin_enrollment_secret: adminpw
-organization_admin_enrollment_id: org2admin
+organization_admin_enrollment_id: org1admin
 organization_admin_enrollment_secret: org1adminpw
 peer_enrollment_id: org1peer
 peer_enrollment_secret: org1peerpw