Merge pull request #204 from grycap/devel

Use GiB
grycap · Nov 8, 2024 · ac5ab9b · ac5ab9b
2 parents 67032ee + 7388bce
commit ac5ab9b
Show file tree

Hide file tree

Showing 27 changed files with 134 additions and 134 deletions.
diff --git a/artifacts/k8s_galaxy.yml b/artifacts/k8s_galaxy.yml
@@ -133,10 +133,10 @@
     - when: deployed.rc == 1
       block:
 
-        - name: Remove GB from max_mem
+        - name: Remove GiB from max_mem
           set_fact:
-            max_mem: "{{ max_mem[:-2] | float - 1 }}"
-          when: max_mem and "GB" in max_mem
+            max_mem: "{{ max_mem[:-3] | float - 1 }}"
+          when: max_mem and "GiB" in max_mem
 
         - name: Create galaxy helm chart values file
           copy:

diff --git a/custom_types.yaml b/custom_types.yaml
@@ -486,7 +486,7 @@ node_types:
       kube_wn_mem:
         type: scalar-unit.size
         description: Kubernetes WNs Memory
-        default: 4 GB
+        default: 4 GiB
         required: false
     artifacts:
       clues_role:

diff --git a/templates/hadoop_cluster.yaml b/templates/hadoop_cluster.yaml
@@ -30,10 +30,10 @@ topology_template:
     fe_mem:
       type: scalar-unit.size
       description: Amount of Memory for the front-end node
-      default: 4 GB
+      default: 4 GiB
       required: yes
       constraints:
-        - valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
     wn_cpus:
       type: integer
       description: Number of CPUs for the WNs
@@ -44,10 +44,10 @@ topology_template:
     wn_mem:
       type: scalar-unit.size
       description: Amount of Memory for the WNs
-      default: 4 GB
+      default: 4 GiB
       required: yes
       constraints:
-        - valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
 
 
   node_templates:

diff --git a/templates/horovod_cluster.yml b/templates/horovod_cluster.yml
@@ -27,16 +27,16 @@ topology_template:
     fe_mem:
       type: scalar-unit.size
       description: Amount of Memory for the front-end node
-      default: 8 GB
+      default: 8 GiB
       required: yes
       constraints:
-        - valid_values: [ 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
     fe_disk_size:
       type: scalar-unit.size
       description: Size of the FE root disk.
-      default: 40 GB
+      default: 40 GiB
       constraints:
-        - valid_values: [ 40 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
+        - valid_values: [ 40 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
 
     wn_num:
       type: integer
@@ -53,16 +53,16 @@ topology_template:
     wn_mem:
       type: scalar-unit.size
       description: Amount of Memory for the WNs
-      default: 8 GB
+      default: 8 GiB
       required: yes
       constraints:
-        - valid_values: [ 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
     wn_disk_size:
       type: scalar-unit.size
       description: Size of the WN root disk.
-      default: 40 GB
+      default: 40 GiB
       constraints:
-        - valid_values: [ 40 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
+        - valid_values: [ 40 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
     wn_num_gpus:
       type: integer
       description: Number of GPUs to assing to this VM

diff --git a/templates/htcondor_cluster.yml b/templates/htcondor_cluster.yml
@@ -38,10 +38,10 @@ topology_template:
     fe_mem:
       type: scalar-unit.size
       description: Amount of Memory for the front-end node
-      default: 1 GB
+      default: 1 GiB
       required: yes
       constraints:
-        - valid_values: [ 2 GB, 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 2 GiB, 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
     wn_cpus:
       type: integer
       description: Number of CPUs for the Worker Nodes
@@ -52,17 +52,17 @@ topology_template:
     wn_mem:
       type: scalar-unit.size
       description: Amount of Memory for the Worker Nodes
-      default: 1 GB
+      default: 1 GiB
       required: yes
       constraints:
-        - valid_values: [ 2 GB, 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 2 GiB, 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
 
     fe_disk_size:
       type: scalar-unit.size
       description: Size of the disk to be attached to the FE instance (Set 0 if disk is not needed)
-      default: 0 GB
+      default: 0 GiB
       constraints:
-        - valid_values: [ 0 GB, 10 GB, 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
+        - valid_values: [ 0 GiB, 10 GiB, 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
     fe_volume_id:
       type: string
       description: "Or URL of the disk to be attached to the FE instance (format: ost://api.cloud.ifca.es/<vol_id>"
@@ -75,9 +75,9 @@ topology_template:
     wn_disk_size:
       type: scalar-unit.size
       description: Size of the disk to be attached to the WN instances (Set 0 if disk is not needed)
-      default: 0 GB
+      default: 0 GiB
       constraints:
-        - valid_values: [ 0 GB, 10 GB, 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
+        - valid_values: [ 0 GiB, 10 GiB, 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
     wn_mount_path:
       type: string
       description: "Path to mount the WN attached disk"

diff --git a/templates/jmeter_cluster.yml b/templates/jmeter_cluster.yml
@@ -26,14 +26,14 @@ topology_template:
     fe_mem:
       type: scalar-unit.size
       description: Amount of Memory for the front-end node
-      default: 1 GB
+      default: 1 GiB
       required: yes
     fe_disk_size:
       type: scalar-unit.size
       description: Size of the FE root disk.
-      default: 20 GB
+      default: 20 GiB
       constraints:
-        - valid_values: [ 20 GB, 30 GB, 40 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
+        - valid_values: [ 20 GiB, 30 GiB, 40 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
 
     wn_cpus:
       type: integer
@@ -43,14 +43,14 @@ topology_template:
     wn_mem:
       type: scalar-unit.size
       description: Amount of Memory for the WNs
-      default: 1 GB
+      default: 1 GiB
       required: yes
     wn_disk_size:
       type: scalar-unit.size
       description: Size of the WN root disk.
-      default: 20 GB
+      default: 20 GiB
       constraints:
-        - valid_values: [ 20 GB, 30 GB, 40 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
+        - valid_values: [ 20 GiB, 30 GiB, 40 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
 
     jmeter_version:
       type: string

diff --git a/templates/k8s_app.yaml b/templates/k8s_app.yaml
@@ -37,7 +37,7 @@ topology_template:
     pvc_size:
       type: scalar-unit.size
       description: Size of the Persistent Volume Claim
-      default: 10 GB
+      default: 10 GiB
     pvc_mount_path:
       type: string
       description: Path to mount the Persistent Volume Claim

diff --git a/templates/k8s_galaxy.yaml b/templates/k8s_galaxy.yaml
@@ -51,10 +51,10 @@ topology_template:
     wn_mem:
       type: scalar-unit.size
       description: Amount of Memory for the WNs
-      default: 8 GB
+      default: 8 GiB
       required: yes
       constraints:
-        - valid_values: [ 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
 
 
   node_templates:

diff --git a/templates/k8s_new_wn_type.yaml b/templates/k8s_new_wn_type.yaml
@@ -34,10 +34,10 @@ topology_template:
     wng_mem:
       type: scalar-unit.size
       description: Amount of Memory for the WNs
-      default: 4 GB
+      default: 4 GiB
       required: yes
       constraints:
-        - valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
     wng_instance_type:
       type: string
       description: Flavor name for the GPU WNs
@@ -62,9 +62,9 @@ topology_template:
     wng_disk_size:
       type: scalar-unit.size
       description: Size of the disk to be attached to the GPU WN instances for storing containers
-      default: 0 GB
+      default: 0 GiB
       constraints:
-        - valid_values: [ 0 GB, 10 GB, 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
+        - valid_values: [ 0 GiB, 10 GiB, 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
 
     wng_kube_nvidia_support:
       type: boolean

diff --git a/templates/kubeflow.yaml b/templates/kubeflow.yaml
@@ -63,16 +63,16 @@ topology_template:
     wn_mem:
       type: scalar-unit.size
       description: Amount of Memory for the WNs
-      default: 8 GB
+      default: 8 GiB
       required: yes
       constraints:
-        - valid_values: [ 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
     wn_disk_size:
       type: scalar-unit.size
       description: Size of the disk to be attached to the WN instances for storing containers
-      default: 40 GB
+      default: 40 GiB
       constraints:
-        - valid_values: [ 40 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
+        - valid_values: [ 40 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
 
   node_templates:
 

diff --git a/templates/kubernetes.yaml b/templates/kubernetes.yaml
@@ -59,20 +59,20 @@ topology_template:
     fe_mem:
       type: scalar-unit.size
       description: Amount of Memory for the front-end node
-      default: 4 GB
+      default: 4 GiB
       required: yes
       constraints:
-        - valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
     fe_instance_type:
       type: string
       description: Flavor name of the front-end node
       default: ""
     fe_disk_size:
       type: scalar-unit.size
       description: Size of the disk to be attached to the FE instance (Set 0 if disk is not needed)
-      default: 10 GB
+      default: 10 GiB
       constraints:
-        - valid_values: [ 10 GB, 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB, 0 GB ]
+        - valid_values: [ 10 GiB, 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB, 0 GiB ]
     fe_volume_id:
       type: string
       description: "Or URL of the disk to be attached to the instance (format: ost://api.cloud.ifca.es/<vol_id>"
@@ -99,10 +99,10 @@ topology_template:
     wn_mem:
       type: scalar-unit.size
       description: Amount of Memory for the WNs
-      default: 4 GB
+      default: 4 GiB
       required: yes
       constraints:
-        - valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
     wn_num_gpus:
       type: integer
       description: Number of GPUs to assing to this VM
@@ -126,9 +126,9 @@ topology_template:
     wn_disk_size:
       type: scalar-unit.size
       description: Size of the root disk of the WNs (in case of 0 disk will no be resized)
-      default: 20 GB
+      default: 20 GiB
       constraints:
-        - valid_values: [ 20 GB, 50 GB, 100 GB, 200 GB, 0 GB ]
+        - valid_values: [ 20 GiB, 50 GiB, 100 GiB, 200 GiB, 0 GiB ]
     wn_kube_nvidia_support:
       type: boolean
       description: Flag to add NVIDIA support in the WN

diff --git a/templates/kubernetes_ha.yaml b/templates/kubernetes_ha.yaml
@@ -42,10 +42,10 @@ topology_template:
     fe_mem:
       type: scalar-unit.size
       description: Amount of Memory for the control-plane nodes
-      default: 8 GB
+      default: 8 GiB
       required: yes
       constraints:
-        - valid_values: [ 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
     fe_instance_type:
       type: string
       description: Flavor name of the front-end node
@@ -60,20 +60,20 @@ topology_template:
     wn_mem:
       type: scalar-unit.size
       description: Amount of Memory for the WNs
-      default: 4 GB
+      default: 4 GiB
       required: yes
       constraints:
-        - valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+        - valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB ]
     wn_instance_type:
       type: string
       description: Flavor name for the WNs
       default: ""
     disk_size:
       type: scalar-unit.size
       description: Size of the disk to be attached to the FE instance
-      default: 10 GB
+      default: 10 GiB
       constraints:
-        - valid_values: [ 10 GB, 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB ]
+        - valid_values: [ 10 GiB, 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB ]
     volume_id:
       type: string
       description: "Or URL of the disk to be attached to the instance (format: ost://api.cloud.ifca.es/<vol_id>"

diff --git a/templates/mesos_cluster.yaml b/templates/mesos_cluster.yaml
@@ -61,7 +61,7 @@ topology_template:
     slave_mem:
       type: scalar-unit.size
       description: Amount of Memory for the slave node
-      default: 2 GB
+      default: 2 GiB
       required: yes
 
     master_cpus:
@@ -73,7 +73,7 @@ topology_template:
     master_mem:
       type: scalar-unit.size
       description: Amount of Memory for the master node
-      default: 4 GB
+      default: 4 GiB
       required: yes
 
 

diff --git a/templates/minio_compose.yaml b/templates/minio_compose.yaml
@@ -70,9 +70,9 @@ topology_template:
     storage_size:
       type: scalar-unit.size
       description: Size of the extra HD added to the instance
-      default: 50 GB
+      default: 50 GiB
       constraints:
-        - valid_values: [ 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB, 10 TB, 20 TB, 40 TB, 100 TB ]
+        - valid_values: [ 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB, 10 TiB, 20 TiB, 40 TiB, 100 TiB ]
     mount_path:
       type: string
       description: Path to mount the extra disk

diff --git a/templates/mlflow_authvm.yaml b/templates/mlflow_authvm.yaml
@@ -72,9 +72,9 @@ topology_template:
     storage_size:
       type: scalar-unit.size
       description: Size of the extra HD added to the instance (Set 0 if disk is not needed)
-      default: 20 GB
+      default: 20 GiB
       constraints:
-        - valid_values: [ 20 GB, 50 GB, 100 GB, 200 GB, 500 GB, 1 TB, 2 TB, 10 TB, 20 TB, 40 TB, 100 TB ]
+        - valid_values: [ 20 GiB, 50 GiB, 100 GiB, 200 GiB, 500 GiB, 1 TiB, 2 TiB, 10 TiB, 20 TiB, 40 TiB, 100 TiB ]
 
     mount_path:
       type: string

diff --git a/templates/nifi.yaml b/templates/nifi.yaml
@@ -230,7 +230,7 @@ topology_template:
                   NIFI_CLUSTER_NODE_PROTOCOL_PORT: '11443'
                   NIFI_CLUSTER_NODE_READ_TIMEOUT: '2 min'
                   NIFI_CLUSTER_PROTOCOL_CONNECTION_HANDSHAKE_TIMEOUT: '2 min'
-                  NIFI_CLUSTER_PROTOCOL_HEARTBEAT_INTERVAL: '1 min'
+                  NIFI_CLUSTER_PROTOCOL_HEARTiBEAT_INTERVAL: '1 min'
                   NIFI_ELECTION_MAX_CANDIDATES: '2'
                   NIFI_ELECTION_MAX_WAIT: '1 min'
                   NIFI_SENSITIVE_PROPS_KEY: '1yhqju3ubhp5rjeb'