Merge pull request #2318 from sownak/develop

[ci-skip] Fix binary download and error in vault management chart

platforms/hyperledger-besu/configuration/add-validator.yaml

@@ -29,38 +29,38 @@
     include_role: 
       name: create/namespace
     vars:
-      component_ns: "{{ organizationItem.name | lower }}-bes"
-      organisation: "{{ organizationItem.name | lower }}"
-      kubernetes: "{{ organizationItem.k8s }}"
-      gitops: "{{ organizationItem.gitops }}"
+      component_ns: "{{ org.name | lower }}-bes"
+      organisation: "{{ org.name | lower }}"
+      kubernetes: "{{ org.k8s }}"
+      gitops: "{{ org.gitops }}"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
     when: add_new_org == 'true'
 
   # Create Storageclass
   - name: Create Storage Class
     include_role:
       name: create/storageclass
     vars:
-      storageclass_name: "{{ organizationItem.cloud_provider }}storageclass"
-      git_dir: "{{ organizationItem.gitops.release_dir }}"
-      org: "{{ organizationItem }}"
-      kubernetes: "{{ organizationItem.k8s }}"
+      storageclass_name: "{{ org.cloud_provider }}storageclass"
+      git_dir: "{{ org.gitops.release_dir }}"
+      org: "{{ org }}"
+      kubernetes: "{{ org.k8s }}"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
     when: add_new_org == 'true'
 
   # 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: "{{ organizationItem.name | lower }}-bes"
+      component_ns: "{{ org.name | lower }}-bes"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
     when: add_new_org == 'true'
 
   # Setup Vault-Kubernetes accesses and Regcred for docker registry
@@ -69,18 +69,18 @@
       name: "{{ playbook_dir }}/../../shared/configuration/roles/setup/vault_kubernetes"
     vars:
       policy_type: "besu"
-      name: "{{ organizationItem.name | lower }}"
-      component_ns: "{{ organizationItem.name | lower }}-bes"
-      component_name: "{{ organizationItem.name | lower }}-vaultk8s-job"
-      component_auth: "besu{{ organizationItem.name | lower }}"
+      name: "{{ org.name | lower }}"
+      component_ns: "{{ org.name | lower }}-bes"
+      component_name: "{{ org.name | lower }}-vaultk8s-job"
+      component_auth: "besu{{ org.name | lower }}"
       component_type: "organization"
-      kubernetes: "{{ organizationItem.k8s }}"
-      vault: "{{ organizationItem.vault }}"
-      gitops: "{{ organizationItem.gitops }}"
+      kubernetes: "{{ org.k8s }}"
+      vault: "{{ org.vault }}"
+      gitops: "{{ org.gitops }}"
       reset_path: "platforms/hyperledger-besu/configuration"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
     when: add_new_org == 'true'
 
   # Installs cert-manager
@@ -103,18 +103,18 @@
     vars:
       root_subject: "{{ network.config.subject }}"
       cert_subject: "{{ network.config.subject | regex_replace(',', '/') }}"
-      services: "{{ organizationItem.services }}"
-      organisation: "{{ organizationItem.name | lower }}"
-      component_ns: "{{ organizationItem.name | lower }}-bes"
-      component_name: "{{ organizationItem.name | lower }}"
-      kubernetes: "{{ organizationItem.k8s }}"
-      vault: "{{ organizationItem.vault }}"
-      gitops: "{{ organizationItem.gitops }}"
-      charts_dir: "{{ organizationItem.gitops.chart_source }}"
-      values_dir: "{{ playbook_dir }}/../../../{{organizationItem.gitops.release_dir}}/{{ organizationItem.name | lower }}"
+      services: "{{ org.services }}"
+      organisation: "{{ org.name | lower }}"
+      component_ns: "{{ org.name | lower }}-bes"
+      component_name: "{{ org.name | lower }}"
+      kubernetes: "{{ org.k8s }}"
+      vault: "{{ org.vault }}"
+      gitops: "{{ org.gitops }}"
+      charts_dir: "{{ org.gitops.chart_source }}"
+      values_dir: "{{ playbook_dir }}/../../../{{org.gitops.release_dir}}/{{ org.name | lower }}"
     loop: "{{ network['organizations']}}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # This role generates the admin PPK for permissioning
   - name: Generate admin key for permissioning

platforms/hyperledger-besu/configuration/cleanup.yaml

@@ -32,17 +32,17 @@
       include_role:
         name: delete/certificates/ambassador
       vars:
-        services: "{{ organizationItem.services }}"
-        kubernetes: "{{ organizationItem.k8s }}"
-        component_ns: "{{ organizationItem.name | lower }}-bes"
-        component_name: "{{ organizationItem.name | lower }}"
-        organization: "{{ organizationItem.name | lower }}"
+        services: "{{ org.services }}"
+        kubernetes: "{{ org.k8s }}"
+        component_ns: "{{ org.name | lower }}-bes"
+        component_name: "{{ org.name | lower }}"
+        organization: "{{ org.name | lower }}"
       loop: "{{ network['organizations']}}"
       loop_control:
-        loop_var: organizationItem
+        loop_var: org
       when:
         - network.type == "besu"
-        - (organizationItem.issuer is defined) and (organizationItem.issuer | lower == "letsencrypt")
+        - (org.issuer is defined) and (org.issuer | lower == "letsencrypt")
 
     # delete build directory
     - name: Remove build directory

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

@@ -27,20 +27,19 @@
     include_role:
       name: create/namespace
     vars:
-      component_ns: "{{ organizationItem.name | lower }}-bes"
-      organisation: "{{ organizationItem.name | lower }}"
-      kubernetes: "{{ organizationItem.k8s }}"
-      gitops: "{{ organizationItem.gitops }}"
+      component_ns: "{{ org.name | lower }}-bes"
+      organisation: "{{ org.name | lower }}"
+      kubernetes: "{{ org.k8s }}"
+      gitops: "{{ org.gitops }}"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # Create Storageclass
   - name: Create Storage Class
     include_role:
       name: create/storageclass
     vars:
-      org: "{{ org }}"
       org_name: "{{ org.name | lower }}"
       cloudProvider: "{{ org.cloud_provider | lower }}"
       sc_name: "{{ org_name }}-{{ cloudProvider }}-storageclass"
@@ -58,30 +57,30 @@
     include_role:
       name: "{{ playbook_dir }}/../../shared/configuration/roles/setup/vault-script"
     vars:
-      component_ns: "{{ organizationItem.name | lower }}-bes"
-      kubernetes: "{{ organizationItem.k8s }}"
+      component_ns: "{{ org.name | lower }}-bes"
+      kubernetes: "{{ org.k8s }}"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # Setup Vault-Kubernetes accesses and Regcred for docker registry
   - name: "Setup vault"
     include_role:
       name: "{{ playbook_dir }}/../../shared/configuration/roles/setup/vault_kubernetes"
     vars:
       policy_type: "besu"
-      name: "{{ organizationItem.name | lower }}"
-      component_ns: "{{ organizationItem.name | lower }}-bes"
-      component_name: "{{ organizationItem.name | lower }}-bes"
-      component_auth: "besu{{ organizationItem.name | lower }}"
-      component_type: "{{ organizationItem.type | lower }}"
-      kubernetes: "{{ organizationItem.k8s }}"
-      vault: "{{ organizationItem.vault }}"
-      gitops: "{{ organizationItem.gitops }}"
+      name: "{{ org.name | lower }}"
+      component_ns: "{{ org.name | lower }}-bes"
+      component_name: "{{ org.name | lower }}-bes"
+      component_auth: "besu{{ org.name | lower }}"
+      component_type: "{{ org.type | lower }}"
+      kubernetes: "{{ org.k8s }}"
+      vault: "{{ org.vault }}"
+      gitops: "{{ org.gitops }}"
       reset_path: "platforms/hyperledger-besu/configuration"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # Generate Ambassador certificate for nodes. These certificates are used for Orion TLS as well
   - name: "Create ambassador certificates for Nodes"
@@ -90,35 +89,35 @@
     vars:
       root_subject: "{{ network.config.subject }}"
       cert_subject: "{{ network.config.subject | regex_replace(',', '/') }}"
-      services: "{{ organizationItem.services }}"
-      organisation: "{{ organizationItem.name | lower }}"
-      component_ns: "{{ organizationItem.name | lower }}-bes"
-      component_name: "{{ organizationItem.name | lower }}"
-      kubernetes: "{{ organizationItem.k8s }}"
-      vault: "{{ organizationItem.vault }}"
-      charts_dir: "{{ organizationItem.gitops.chart_source }}"
-      gitops: "{{ organizationItem.gitops }}"
-      values_dir: "{{ playbook_dir }}/../../../{{organizationItem.gitops.release_dir}}/{{ organizationItem.name | lower }}"
+      services: "{{ org.services }}"
+      organisation: "{{ org.name | lower }}"
+      component_ns: "{{ org.name | lower }}-bes"
+      component_name: "{{ org.name | lower }}"
+      kubernetes: "{{ org.k8s }}"
+      vault: "{{ org.vault }}"
+      charts_dir: "{{ org.gitops.chart_source }}"
+      gitops: "{{ org.gitops }}"
+      values_dir: "{{ playbook_dir }}/../../../{{org.gitops.release_dir}}/{{ org.name | lower }}"
     loop: "{{ network['organizations']}}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # This role generates key pair and nodeaddress for all orgs of the network
   - name: "Generate crypto for the network nodes"
     include_role:
       name: create/crypto/node
     vars:
       build_path: "{{ playbook_dir }}/build"
-      organisation: "{{ organizationItem.name | lower }}"
-      organisation_ns: "{{ organizationItem.name | lower }}-bes"
-      kubernetes: "{{ organizationItem.k8s }}"
-      vault: "{{ organizationItem.vault }}"
-      charts_dir: "{{ organizationItem.gitops.chart_source }}"
-      gitops: "{{ organizationItem.gitops }}"
-      values_dir: "{{ playbook_dir }}/../../../{{organizationItem.gitops.release_dir}}/{{ organizationItem.name | lower }}"
+      organisation: "{{ org.name | lower }}"
+      organisation_ns: "{{ org.name | lower }}-bes"
+      kubernetes: "{{ org.k8s }}"
+      vault: "{{ org.vault }}"
+      charts_dir: "{{ org.gitops.chart_source }}"
+      gitops: "{{ org.gitops }}"
+      values_dir: "{{ playbook_dir }}/../../../{{org.gitops.release_dir}}/{{ org.name | lower }}"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # This role generates the genesis.json
   - name: "Generate genesis file"

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

@@ -19,45 +19,45 @@
     include_role:
       name: create/namespace
     vars:
-      component_ns: "{{ organizationItem.name | lower }}-bes"
-      organisation: "{{ organizationItem.name | lower }}"
-      kubernetes: "{{ organizationItem.k8s }}"
-      gitops: "{{ organizationItem.gitops }}"
+      component_ns: "{{ org.name | lower }}-bes"
+      organisation: "{{ org.name | lower }}"
+      kubernetes: "{{ org.k8s }}"
+      gitops: "{{ org.gitops }}"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # Create Storageclass
   - name: Create Storage Class
     include_role:
       name: create/storageclass
     vars:
-      storageclass_name: "{{ organizationItem.cloud_provider }}storageclass"
-      git_dir: "{{ organizationItem.gitops.release_dir }}"
-      org: "{{ organizationItem }}"
-      kubernetes: "{{ organizationItem.k8s }}"
+      storageclass_name: "{{ org.cloud_provider }}storageclass"
+      git_dir: "{{ org.gitops.release_dir }}"
+      org: "{{ org }}"
+      kubernetes: "{{ org.k8s }}"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # Setup Vault-Kubernetes accesses and Regcred for docker registry
   - name: "Setup vault"
     include_role:
       name: "{{ playbook_dir }}/../../shared/configuration/roles/setup/vault_kubernetes"
     vars:
       policy_type: "besu"
-      name: "{{ organizationItem.name | lower }}"
-      component_ns: "{{ organizationItem.name | lower }}-bes"
-      component_name: "{{ organizationItem.name | lower }}-vaultk8s-job"
-      component_auth: "besu{{ organizationItem.name | lower }}"
+      name: "{{ org.name | lower }}"
+      component_ns: "{{ org.name | lower }}-bes"
+      component_name: "{{ org.name | lower }}-vaultk8s-job"
+      component_auth: "besu{{ org.name | lower }}"
       component_type: "organization"
-      kubernetes: "{{ organizationItem.k8s }}"
-      vault: "{{ organizationItem.vault }}"
-      gitops: "{{ organizationItem.gitops }}"
+      kubernetes: "{{ org.k8s }}"
+      vault: "{{ org.vault }}"
+      gitops: "{{ org.gitops }}"
       reset_path: "platforms/hyperledger-besu/configuration"
     loop: "{{ network['organizations'] }}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # Generate Ambassador certificate for nodes. These certificates are used for Orion TLS as well
   - name: "Create ambassador certificates for Nodes"
@@ -66,35 +66,35 @@
     vars:
       root_subject: "{{ network.config.subject }}"
       cert_subject: "{{ network.config.subject | regex_replace(',', '/') }}"
-      services: "{{ organizationItem.services }}"
-      organisation: "{{ organizationItem.name | lower }}"
-      component_ns: "{{ organizationItem.name | lower }}-bes"
-      component_name: "{{ organizationItem.name | lower }}"
-      kubernetes: "{{ organizationItem.k8s }}"
-      vault: "{{ organizationItem.vault }}"
-      charts_dir: "{{ organizationItem.gitops.chart_source }}"
-      gitops: "{{ organizationItem.gitops }}"
-      values_dir: "{{ playbook_dir }}/../../../{{organizationItem.gitops.release_dir}}/{{ organizationItem.name | lower }}"
+      services: "{{ org.services }}"
+      organisation: "{{ org.name | lower }}"
+      component_ns: "{{ org.name | lower }}-bes"
+      component_name: "{{ org.name | lower }}"
+      kubernetes: "{{ org.k8s }}"
+      vault: "{{ org.vault }}"
+      charts_dir: "{{ org.gitops.chart_source }}"
+      gitops: "{{ org.gitops }}"
+      values_dir: "{{ playbook_dir }}/../../../{{org.gitops.release_dir}}/{{ org.name | lower }}"
     loop: "{{ network['organizations']}}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # This role generates key pair and nodeaddress for all orgs of the network
   - name: "Generate crypto for the network nodes"
     include_role:
       name: create/crypto/node
     vars:
       build_path: "{{ playbook_dir }}/build"
-      organisation: "{{ organizationItem.name | lower }}"
-      organisation_ns: "{{ organizationItem.name | lower }}-bes"
-      kubernetes: "{{ organizationItem.k8s }}"
-      vault: "{{ organizationItem.vault }}"
-      charts_dir: "{{ organizationItem.gitops.chart_source }}"
-      gitops: "{{ organizationItem.gitops }}"
-      values_dir: "{{ playbook_dir }}/../../../{{organizationItem.gitops.release_dir}}/{{ organizationItem.name | lower }}"
+      organisation: "{{ org.name | lower }}"
+      organisation_ns: "{{ org.name | lower }}-bes"
+      kubernetes: "{{ org.k8s }}"
+      vault: "{{ org.vault }}"
+      charts_dir: "{{ org.gitops.chart_source }}"
+      gitops: "{{ org.gitops }}"
+      values_dir: "{{ playbook_dir }}/../../../{{org.gitops.release_dir}}/{{ org.name | lower }}"
     loop: "{{ network['organizations']}}"
     loop_control:
-      loop_var: organizationItem
+      loop_var: org
 
   # This role generates the crypto materials for orion tm
   - name: "Generate crypto for the Orion transaction manager"

platforms/hyperledger-besu/configuration/roles/create/certificates/ambassador/Readme.md

@@ -54,9 +54,9 @@ This task pushes the above generated value files to git repo.
 #### 4. Create the Ambassador credentials
 This task creates the Ambassador TLS credentials
 ##### Input Variables
-    *namespace: "Namespace of org , Format: {{ organizationItem.name | lower }}-bes"
+    *namespace: "Namespace of org , Format: {{ org.name | lower }}-bes"
     *vault: "Vault Details"
-    *kubernetes: "{{ organizationItem.k8s }}"
+    *kubernetes: "{{ org.k8s }}"
 **include_role**: It includes the name of intermediatory role which is required for creating the secrets, here `k8s_secrets`.
 
 #### Note: