From 7388bce1afb442dcdcc9f9443e1020bc22048561 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Fri, 8 Nov 2024 08:32:11 +0100 Subject: [PATCH] Use GiB --- artifacts/k8s_galaxy.yml | 6 +++--- custom_types.yaml | 2 +- templates/hadoop_cluster.yaml | 8 ++++---- templates/horovod_cluster.yml | 16 ++++++++-------- templates/htcondor_cluster.yml | 16 ++++++++-------- templates/jmeter_cluster.yml | 12 ++++++------ templates/k8s_app.yaml | 2 +- templates/k8s_galaxy.yaml | 4 ++-- templates/k8s_new_wn_type.yaml | 8 ++++---- templates/kubeflow.yaml | 8 ++++---- templates/kubernetes.yaml | 16 ++++++++-------- templates/kubernetes_ha.yaml | 12 ++++++------ templates/mesos_cluster.yaml | 4 ++-- templates/minio_compose.yaml | 4 ++-- templates/mlflow_authvm.yaml | 4 ++-- templates/nifi.yaml | 2 +- templates/nomad.yaml | 16 ++++++++-------- templates/nomad_ai4eosc.yaml | 16 ++++++++-------- templates/nomad_ai4eosc_join.yaml | 16 ++++++++-------- templates/obm.yaml | 16 ++++++++-------- templates/oscar.yaml | 16 ++++++++-------- templates/scipion.yaml | 16 ++++++++-------- templates/simple-node-disk.yml | 12 ++++++------ templates/slurm_cluster.yml | 12 ++++++------ templates/sqaaas.yaml | 12 ++++++------ templates/stac_vm.yaml | 4 ++-- templates/storm.yml | 8 ++++---- 27 files changed, 134 insertions(+), 134 deletions(-) diff --git a/artifacts/k8s_galaxy.yml b/artifacts/k8s_galaxy.yml index ccff10a..0c47fdf 100644 --- 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 index 7c4858e..72cf1f0 100644 --- 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 index 1dce5c8..f34eac6 100644 --- 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 index 50cf9a9..eb3a9ec 100644 --- 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 index 3d33b0d..12f8b5a 100644 --- 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/" @@ -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 index 3330d14..f01adb9 100644 --- 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 index fc08a4e..eccd479 100644 --- 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 index 197dff1..551189b 100644 --- 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 index 4ebdeee..cffea97 100644 --- 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 index 8eb74b9..ffdc803 100644 --- 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 index d15fc68..4d9f94c 100644 --- a/templates/kubernetes.yaml +++ b/templates/kubernetes.yaml @@ -59,10 +59,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 ] fe_instance_type: type: string description: Flavor name of the front-end node @@ -70,9 +70,9 @@ topology_template: 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/" @@ -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 index 006daa9..e40c902 100644 --- 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,10 +60,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_instance_type: type: string description: Flavor name for the WNs @@ -71,9 +71,9 @@ topology_template: 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/" diff --git a/templates/mesos_cluster.yaml b/templates/mesos_cluster.yaml index 617dee3..3b5c600 100644 --- 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 index 3db9124..6d7df53 100644 --- 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 index 2555f75..251f31b 100644 --- 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 index c9fb7c1..840dea4 100644 --- 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' diff --git a/templates/nomad.yaml b/templates/nomad.yaml index f526798..21d62fe 100644 --- a/templates/nomad.yaml +++ b/templates/nomad.yaml @@ -40,10 +40,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_num: type: integer @@ -60,10 +60,10 @@ topology_template: wn_mem: type: scalar-unit.size description: Amount of Memory for the WNs (without public IP) - 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_pub_num: type: integer @@ -80,10 +80,10 @@ topology_template: wn_pub_mem: type: scalar-unit.size description: Amount of Memory for the WNs (with public IP) - 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_gpu_num: type: integer @@ -100,10 +100,10 @@ topology_template: wn_gpu_mem: type: scalar-unit.size description: Amount of Memory for the GPU 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_gpu_num_gpus: type: integer description: Number of GPUs to assing to this VM diff --git a/templates/nomad_ai4eosc.yaml b/templates/nomad_ai4eosc.yaml index 6bdc32b..f0c1019 100644 --- a/templates/nomad_ai4eosc.yaml +++ b/templates/nomad_ai4eosc.yaml @@ -43,10 +43,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_num: type: integer @@ -65,10 +65,10 @@ topology_template: wn_mem: type: scalar-unit.size description: Amount of Memory for the WNs (without public IP) - 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_pub_num: type: integer @@ -85,10 +85,10 @@ topology_template: wn_pub_mem: type: scalar-unit.size description: Amount of Memory for the WNs (with public IP) - 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_gpu_num: type: integer @@ -105,10 +105,10 @@ topology_template: wn_gpu_mem: type: scalar-unit.size description: Amount of Memory for the GPU 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_gpu_num_gpus: type: integer description: Number of GPUs to assing to this VM diff --git a/templates/nomad_ai4eosc_join.yaml b/templates/nomad_ai4eosc_join.yaml index 4eb1bf7..16b7960 100644 --- a/templates/nomad_ai4eosc_join.yaml +++ b/templates/nomad_ai4eosc_join.yaml @@ -46,10 +46,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_num: type: integer @@ -68,10 +68,10 @@ topology_template: wn_mem: type: scalar-unit.size description: Amount of Memory for the WNs (without public IP) - 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_pub_num: type: integer @@ -88,10 +88,10 @@ topology_template: wn_pub_mem: type: scalar-unit.size description: Amount of Memory for the WNs (with public IP) - 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_gpu_num: type: integer @@ -108,10 +108,10 @@ topology_template: wn_gpu_mem: type: scalar-unit.size description: Amount of Memory for the GPU 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_gpu_num_gpus: type: integer description: Number of GPUs to assing to this VM diff --git a/templates/obm.yaml b/templates/obm.yaml index 2fe1b81..e815dd8 100644 --- a/templates/obm.yaml +++ b/templates/obm.yaml @@ -23,16 +23,16 @@ topology_template: memory_size: type: string description: ram memory required for the OBM instance - default: 2 GB + default: 2 GiB constraints: - - valid_values: [ 2 GB, 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB ] + - valid_values: [ 2 GiB, 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB ] disk_size: type: string # type: scalar-unit.size description: Size of the first disk to be attached to the 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 first disk to be attached to the instance (format: ost://api.cloud.ifca.es/" @@ -41,9 +41,9 @@ topology_template: type: string # type: scalar-unit.size description: Size of the second disk to be attached to the 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_id2: type: string description: "Or URL of the second disk to be attached to the instance (format: ost://api.cloud.ifca.es/" @@ -58,9 +58,9 @@ topology_template: ci_memory_size: type: string description: ram memory required for the Compute instance - default: 2 GB + default: 2 GiB constraints: - - valid_values: [ 2 GB, 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB ] + - valid_values: [ 2 GiB, 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB ] node_templates: diff --git a/templates/oscar.yaml b/templates/oscar.yaml index 3b1660c..0474334 100644 --- a/templates/oscar.yaml +++ b/templates/oscar.yaml @@ -65,10 +65,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 ] fe_instance_type: type: string description: Flavor name of the front-end node. Only required in case of special flavors (i.e. with GPUs) @@ -83,16 +83,16 @@ 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_disk_size: type: scalar-unit.size description: Size of the root disk of the WNs - default: 20 GB + default: 20 GiB constraints: - - valid_values: [ 20 GB, 50 GB, 100 GB, 200 GB ] + - valid_values: [ 20 GiB, 50 GiB, 100 GiB, 200 GiB ] wn_instance_type: type: string description: Flavor name of the WN node. Only required in case of special flavors (i.e. with GPUs) @@ -101,10 +101,10 @@ topology_template: storage_size: type: string description: Size of the extra HD added to the front-end node - default: 50 GB + default: 50 GiB required: yes constraints: - - valid_values: [ 30 GB, 50 GB, 100 GB ] + - valid_values: [ 30 GiB, 50 GiB, 100 GiB ] admin_token: type: string diff --git a/templates/scipion.yaml b/templates/scipion.yaml index 6182cdc..87aaf12 100644 --- a/templates/scipion.yaml +++ b/templates/scipion.yaml @@ -35,11 +35,11 @@ topology_template: - valid_values: [ 2, 4, 8, 16, 32, 64 ] mem_size_master: type: scalar-unit.size - description: Ammount of RAM (GB) to assign to the master - default: 30 GB + description: Ammount of RAM (GiB) to assign to the master + default: 30 GiB required: yes constraints: - - valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB ] + - valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB ] num_gpus_worker: type: integer description: Number of GPUs to assing to the worker @@ -54,17 +54,17 @@ topology_template: - valid_values: [ 2, 4, 8, 16, 32, 64 ] mem_size_worker: type: scalar-unit.size - description: Ammount of RAM (GB) to assign to the worker - default: 30 GB + description: Ammount of RAM (GiB) to assign to the worker + default: 30 GiB required: yes constraints: - - valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB ] + - valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB ] disk_size: type: scalar-unit.size description: Size of the external disk attached to the server - default: 100 GB + default: 100 GiB constraints: - - valid_values: [ 100 GB, 500 GB, 1 TB, 5 TB, 8TB ] + - valid_values: [ 100 GiB, 500 GiB, 1 TiB, 5 TiB, 8TiB ] workers_num: type: integer description: Number of worker nodes in cluster diff --git a/templates/simple-node-disk.yml b/templates/simple-node-disk.yml index 55cc616..09de6de 100644 --- a/templates/simple-node-disk.yml +++ b/templates/simple-node-disk.yml @@ -60,15 +60,15 @@ topology_template: mem_size: type: scalar-unit.size description: Amount of memory for the VM - default: 4 GB + default: 4 GiB constraints: - - valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB, 2 GB ] + - valid_values: [ 4 GiB, 8 GiB, 16 GiB, 32 GiB, 64 GiB, 128 GiB, 256 GiB, 512 GiB, 2 GiB ] disk_size: type: scalar-unit.size description: Size of the root disk of the VM (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 ] instance_type: type: string description: Flavor name of the instance @@ -81,9 +81,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: 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, 10 TB, 20 TB, 40 TB, 100 TB ] + - valid_values: [ 0 GiB, 10 GiB, 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 description: Path to mount the extra disk diff --git a/templates/slurm_cluster.yml b/templates/slurm_cluster.yml index 317f330..b8ad950 100644 --- a/templates/slurm_cluster.yml +++ b/templates/slurm_cluster.yml @@ -40,7 +40,7 @@ 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 wn_cpus: type: integer @@ -50,15 +50,15 @@ topology_template: wn_mem: type: scalar-unit.size description: Amount of Memory for the WNs - default: 1 GB + default: 1 GiB required: yes 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/" @@ -71,9 +71,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/sqaaas.yaml b/templates/sqaaas.yaml index 5d7f845..c2b1270 100644 --- a/templates/sqaaas.yaml +++ b/templates/sqaaas.yaml @@ -44,10 +44,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 ] fe_instance_type: type: string description: Flavor name of the front-end node @@ -62,10 +62,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_instance_type: type: string description: Flavor name for the WNs @@ -73,9 +73,9 @@ topology_template: 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/" diff --git a/templates/stac_vm.yaml b/templates/stac_vm.yaml index 7b34c3d..b887c30 100644 --- a/templates/stac_vm.yaml +++ b/templates/stac_vm.yaml @@ -29,9 +29,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/storm.yml b/templates/storm.yml index b710ddb..7ea9061 100644 --- a/templates/storm.yml +++ b/templates/storm.yml @@ -30,10 +30,10 @@ topology_template: fe_mem: type: scalar-unit.size description: Amount of Memory for the front-end node - default: 2 GB + default: 2 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 @@ -46,10 +46,10 @@ topology_template: wn_mem: type: scalar-unit.size description: Amount of Memory for the WNs - default: 2 GB + default: 2 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 ] node_templates: