feat(shared): Simplifying storage class creation with helm module

platforms/hyperledger-besu/configuration/deploy-network.yaml

@@ -38,11 +38,12 @@
   # Create Storageclass
   - name: Create Storage Class
     include_role:
-      name: create/storageclass
+      name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"
     vars:
       org_name: "{{ org.name | lower }}"
       cloudProvider: "{{ org.cloud_provider | lower }}"
       sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
+      component_ns: "{{ org.name | lower }}-bes"
       kubernetes: "{{ org.k8s }}"
       region: "{{ org.k8s.region | default('eu-west-1') }}"
       git_dir: "{{ org.gitops.release_dir }}"
@@ -135,7 +136,6 @@
       build_path: "./build"
       kubernetes: "{{ item.k8s }}"
       consensus: "{{ network.config.consensus }}"
-      component_ns: "{{ item.name | lower }}-bes"
       name: "{{ item.name | lower }}"
       peers: "{{ item.services.validators}}"
       sc_name: "{{ name }}-{{ item.cloud_provider | lower }}-storageclass"

platforms/hyperledger-besu/configuration/generate-crypto.yaml

@@ -30,10 +30,13 @@
   # Create Storageclass
   - name: Create Storage Class
     include_role:
-      name: create/storageclass
+      name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"
     vars:
-      storageclass_name: "{{ org.cloud_provider }}storageclass"
+      org_name: "{{ org.name | lower }}"
+      cloudProvider: "{{ org.cloud_provider | lower }}"
+      sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
       git_dir: "{{ org.gitops.release_dir }}"
+      charts_dir: "platforms/shared/charts"
       org: "{{ org }}"
       kubernetes: "{{ org.k8s }}"
     loop: "{{ network['organizations'] }}"

platforms/hyperledger-fabric/configuration/add-orderer-organization.yaml

@@ -60,19 +60,20 @@
     # Create Storageclass for new organization
     - name: "Create storageclass for new org"
       include_role:
-        name: "create/storageclass"
+        name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"  
       vars:
-        org_name: "{{ item.name | lower }}"
-        cloudProvider: "{{ item.cloud_provider | lower }}"
+        org_name: "{{ org.name | lower }}"
+        cloudProvider: "{{ org.cloud_provider | lower }}"
         sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
-        component_type: "{{ item.type | lower }}"
-        region: "{{ item.k8s.region | default('eu-west-1') }}"
-        kubernetes: "{{ item.k8s }}"
+        component_type: "{{ org.type | lower }}"
+        region: "{{ org.k8s.region | default('eu-west-1') }}"
+        kubernetes: "{{ org.k8s }}"
         platform_suffix: "net"
         charts_dir: "platforms/shared/charts"
-        release_dir: "./build"
       loop: "{{ network['organizations'] }}"
-      when: item.org_status == 'new'
+      loop_control:
+        loop_var: org
+      when: org.org_status == 'new'
 
     # Create CA Server value files and check-in for new organization
     - name: "Create CA Server for new org"

platforms/hyperledger-fabric/configuration/add-organization.yaml

@@ -58,19 +58,20 @@
 
     # Create Storageclass for new organization
     - include_role:
-        name: "create/storageclass"
+        name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"  
       vars:
-        org_name: "{{ item.name | lower }}"
-        cloudProvider: "{{ item.cloud_provider | lower }}"
+        org_name: "{{ org.name | lower }}"
+        cloudProvider: "{{ org.cloud_provider | lower }}"
         sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
-        region: "{{ item.k8s.region | default('eu-west-1') }}"
-        component_type: "{{ item.type | lower}}"
-        kubernetes: "{{ item.k8s }}"
+        region: "{{ org.k8s.region | default('eu-west-1') }}"
+        component_type: "{{ org.type | lower}}"
+        kubernetes: "{{ org.k8s }}"
         platform_suffix: "net"
         charts_dir: "platforms/shared/charts"
-        release_dir: "./build"
       loop: "{{ network['organizations'] }}"
-      when: item.org_status == 'new'
+      loop_control:
+        loop_var: org
+      when: org.org_status == 'new'
 
     # Create CA Server value files and check-in for new organization
     - include_role:

platforms/hyperledger-fabric/configuration/add-peer.yaml

@@ -55,18 +55,19 @@
 
   # Create Storageclass for new organization
   - include_role:
-      name: "create/storageclass"
+      name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"  
     vars:
-      org_name: "{{ item.name | lower }}"
-      cloudProvider: "{{ item.cloud_provider | lower }}"
+      org_name: "{{ org.name | lower }}"
+      cloudProvider: "{{ org.cloud_provider | lower }}"
       sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
-      component_type: "{{ item.type | lower}}"
-      region: "{{ item.k8s.region | default('eu-west-1') }}"
-      kubernetes: "{{ item.k8s }}"
+      component_type: "{{ org.type | lower}}"
+      region: "{{ org.k8s.region | default('eu-west-1') }}"
+      kubernetes: "{{ org.k8s }}"
       platform_suffix: "net"
       charts_dir: "platforms/shared/charts"
-      release_dir: "./build"
     loop: "{{ network['organizations'] }}"
+    loop_control:
+      loop_var: org
 
   # Create Organization crypto materials for new organization
   - include_role:
@@ -112,6 +113,7 @@
       values_dir: "{{playbook_dir}}/../../../{{item.gitops.release_dir}}/{{ item.name | lower }}"
     loop: "{{ network['organizations'] }}"
     when: item.type == 'peer'
+
   # This role fetches block 0 and joins peers of new organizaion to the channel
   - include_role:
       name: "create/channels_join"

platforms/hyperledger-fabric/configuration/deploy-network.yaml

@@ -89,18 +89,19 @@
     # Create Storageclass 
     - name: Create storageclass for each organization
       include_role:
-        name: "create/storageclass"
+        name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass" 
       vars:
-        org_name: "{{ item.name | lower }}"
-        cloudProvider: "{{ item.cloud_provider | lower }}"
+        org_name: "{{ org.name | lower }}"
+        cloudProvider: "{{ org.cloud_provider | lower }}"
         sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
-        component_type: "{{ item.type | lower }}"
-        region: "{{ item.k8s.region | default('eu-west-1') }}"
-        kubernetes: "{{ item.k8s }}"
+        component_type: "{{ org.type | lower }}"
+        region: "{{ org.k8s.region | default('eu-west-1') }}"
+        kubernetes: "{{ org.k8s }}"
         charts_dir: "platforms/shared/charts"
         platform_suffix: "net"
-        release_dir: "./build"
       loop: "{{ network['organizations'] }}"
+      loop_control:
+        loop_var: org
 
     # Create CA Server helm-value files and check-in
     - name: Create CA server for each organization

platforms/hyperledger-fabric/configuration/deploy-operator-network.yaml

@@ -35,21 +35,25 @@
         release_dir: "./build"
       loop: "{{ network['organizations'] }}"
 
+    # Create Storageclass for new organization for when operator using
     - name: Create storageclass for each organization
       include_role:
-        name: "create/storageclass"
+        name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"  
       vars:
-        org_name: "{{ item.name | lower }}"
-        cloudProvider: "{{ item.cloud_provider | lower }}"
+        org_name: "{{ org.name | lower }}"
+        cloudProvider: "{{ org.cloud_provider | lower }}"
         sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
-        component_type: "{{ item.type | lower }}"
-        region: "{{ item.k8s.region | default('eu-west-1') }}"
-        kubernetes: "{{ item.k8s }}"
+        component_type: "{{ org.type | lower}}"
+        kubernetes: "{{ org.k8s }}"
+        region: "{{ org.k8s.region | default('eu-west-1') }}"
         charts_dir: "platforms/shared/charts"
         platform_suffix: "net"
-        release_dir: "./build"
       loop: "{{ network['organizations'] }}"
-
+      loop_control:
+        loop_var: org
+      when: 
+      - network.env.type == 'operator'  
+
     - name: Create CA server for each organization
       include_role:
         name: "operator/create/ca/server"

platforms/hyperledger-indy/configuration/deploy-network.yaml

@@ -56,20 +56,21 @@
   # Create StorageClass
   - name: Create Storage Class
     include_role:
-      name: create/storageclass
+      name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"
     vars:
-      organization: "{{ organizationItem.name | lower }}"
-      component_ns: "{{ organizationItem.name | lower }}-ns"
-      provider: "{{ organizationItem.cloud_provider }}"
-      storageclass_name: "{{ provider }}-storageclass"
-      component_name: "{{ organization }}-{{ storageclass_name }}"
-      gitops: "{{ organizationItem.gitops }}"
-      kubernetes: "{{ organizationItem.k8s }}"
-      aws: "{{ organizationItem.aws }}"
+      org_name: "{{ org.name | lower }}"
+      cloudProvider: "{{ org.cloud_provider | lower }}"
+      sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
+      region: "{{ org.k8s.region | default('eu-west-1') }}"
+      git_dir: "{{ org.gitops.release_dir }}"
+      gitops: "{{ org.gitops }}"
+      kubernetes: "{{ org.k8s }}"
+      charts_dir: "platforms/shared/charts"
+      platform_suffix: "ns"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
-    when: organizationItem.org_status is not defined or organizationItem.org_status == 'new'
+      loop_var: org
+    when: org.org_status is not defined or org.org_status == 'new'
 
   # Admin K8S auth
   - name: Admin K8S auth
@@ -194,6 +195,7 @@
       name: setup/node
     vars:
       organization: "{{ organizationItem.name | lower }}"
+      sc_name: "{{ organization }}-{{ organizationItem.cloud_provider | lower }}-storageclass"
       component_ns: "{{ organizationItem.name | lower }}-ns"
       services: "{{ organizationItem.services }}"
       kubernetes: "{{ organizationItem.k8s }}"

platforms/hyperledger-indy/configuration/roles/create/helm_component/node/templates/node.tpl

@@ -107,7 +107,7 @@ spec:
     storage:
       data:
         storagesize: 3Gi
-        storageClassName: {{ organizationItem.name }}-{{ organizationItem.cloud_provider }}-storageclass
+        storageClassName: {{ sc_name }}
       keys:
         storagesize: 3Gi
-        storageClassName: {{ organizationItem.name }}-{{ organizationItem.cloud_provider }}-storageclass
+        storageClassName: {{ sc_name }}

platforms/quorum/configuration/deploy-network.yaml

@@ -36,18 +36,30 @@
   # Create Storageclass
   - name: Create Storage Class
     include_role:
-      name: create/storageclass
+      name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"
     vars:
-      org_name: "{{ item.name | lower }}"
-      cloudProvider: "{{ item.cloud_provider | lower }}"
+      org_name: "{{ org.name | lower }}"
+      cloudProvider: "{{ org.cloud_provider | lower }}"
       sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
-      region: "{{ item.k8s.region | default('eu-west-1') }}"
-      git_dir: "{{ item.gitops.release_dir }}"
-      org: "{{ item }}"
-      kubernetes: "{{ item.k8s }}"
+      region: "{{ org.k8s.region | default('eu-west-1') }}"
+      git_dir: "{{ org.gitops.release_dir }}"
+      kubernetes: "{{ org.k8s }}"
       charts_dir: "platforms/shared/charts"
       platform_suffix: "quo"
     loop: "{{ network['organizations'] }}"
+    loop_control:
+      loop_var: org
+
+  #Create Vault scrit as configmap for Vault CURD operations
+  - name: setup vault script
+    include_role:
+      name: "{{ playbook_dir }}/../../shared/configuration/roles/setup/vault-script"
+    vars:
+      component_ns: "{{ org.name | lower }}-quo"
+      kubernetes: "{{ org.k8s }}"
+    loop: "{{ network['organizations'] }}"
+    loop_control:
+      loop_var: org
 
   #Create Vault scrit as configmap for Vault CURD operations
   - name: setup vault script
@@ -113,7 +125,6 @@
     loop_control:
       loop_var: org
 
-
   # This role makes up the istanbul binary and place it in the bin directory
   - name: "Setup istanbul-tools"
     include_role:

platforms/r3-corda-ent/configuration/deploy-network.yaml

@@ -36,12 +36,12 @@
   # Create Storageclass that will be used for this deployment
   - name: Create Storage Class
     include_role:
-      name: create/storageclass
+      name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"
     vars:
       org_name: "{{ org.name | lower }}"
       cloudProvider: "{{ org.cloud_provider | lower }}"
       sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
-      region: "{{ item.k8s.region | default('eu-west-1') }}"
+      region: "{{ org.k8s.region | default('eu-west-1') }}"
       git_dir: "{{ org.gitops.release_dir }}"
       kubernetes: "{{ org.k8s }}"
       gitops: "{{ org.gitops }}"

platforms/r3-corda-ent/configuration/deploy-nodes.yaml

@@ -23,11 +23,14 @@
   # Create Storageclass that will be used for this deployment
   - name: Create Storage Class
     include_role:
-      name: create/storageclass
+      name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"
     vars:
-      storageclass_name: "cordaentsc"
+      org_name: "{{ org.name | lower }}"
+      cloudProvider: "{{ org.cloud_provider | lower }}"
+      sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
       git_dir: "{{ org.gitops.release_dir }}"
       kubernetes: "{{ org.k8s }}"
+      charts_dir: "platforms/shared/charts"
     loop: "{{ network['organizations'] }}"
     loop_control:
       loop_var: org

platforms/r3-corda-ent/configuration/roles/setup/float-environment/tasks/main.yaml

@@ -41,10 +41,13 @@
 # Create Storageclass that will be used for this deployment
 - name: Create Storage Class
   include_role:
-    name: create/storageclass
+    name: "{{ playbook_dir }}/../../../platforms/shared/configuration/roles/setup/storageclass"
   vars:
-    storageclass_name: "cordaentsc"
+    org_name: "{{ org.name | lower }}"
+    cloudProvider: "{{ org.cloud_provider | lower }}"
+    sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
     kubernetes: "{{ org.services.float.k8s }}"
+    charts_dir: "platforms/shared/charts"
     gitops: "{{ org.services.float.gitops }}"
 
 # create namespace, service account and clusterrolebinding