Merge pull request #137 from grycap/devel

Devel
grycap · Apr 16, 2024 · f288efa · f288efa
2 parents 3215869 + 8761a82
commit f288efa
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/templates/oscar.yaml b/templates/oscar.yaml
@@ -20,6 +20,7 @@ metadata:
       - fe_instance_type
       - wn_cpus
       - wn_mem
+      - wn_disk_size
       - wn_instance_type
       - storage_size
     OSCAR Data:
@@ -85,6 +86,12 @@ topology_template:
       required: yes
       constraints:
         - valid_values: [ 4 GB, 8 GB, 16 GB, 32 GB, 64 GB, 128 GB, 256 GB, 512 GB ]
+    wn_disk_size:
+      type: scalar-unit.size
+      description: Size of the root disk of the WNs
+      default: 20 GB
+      constraints:
+        - valid_values: [ 20 GB, 50 GB, 100 GB, 200 GB ]
     wn_instance_type:
       type: string
       description: Flavor name of the WN node. Only required in case of special flavors (i.e. with GPUs)
@@ -256,6 +263,7 @@ topology_template:
             count: { get_input: wn_num }
         host:
           properties:
+            disk_size: { get_input: wn_disk_size }
             num_cpus: { get_input: wn_cpus }
             mem_size: { get_input: wn_mem }
             instance_type: { get_input: wn_instance_type }

diff --git a/templates/yProv.yml b/templates/yProv.yml
@@ -32,7 +32,7 @@ topology_template:
     neo4j_plugins:
       type: string
       description: neo4j plugins to be enabled
-      default: '["graph-data-science"]'
+      default: '[graph-data-science]'
     storage_dimension:
       type: string
       description: Neo4j storage capacity
@@ -53,13 +53,25 @@ topology_template:
         namespace: yprov
         chart_url: "https://github.com/HPCI-Lab/yProv/raw/yprov_v2/cloud/yProv.tgz"
         name: yProv
+        values_file:
+          concat:
+            - |-
+                db:
+                  env:
+                    auth:
+                      name: NEO4J_AUTH
+                    license:
+                      name: NEO4J_ACCEPT_LICENSE_AGREEMENT
+                    plugins:
+                      name: NEO4J_PLUGINS
+                      value: |
+                        '
+            - get_input: neo4j_plugins
+            - |-
+                '
         values:
-          db.env.auth.name: NEO4J_AUTH
           db.env.auth.value: { get_input: neo4j_auth }
-          db.env.license.name: NEO4J_ACCEPT_LICENSE_AGREEMENT
           db.env.license.value: { get_input: neo4j_license }
-          db.env.plugins.name: NEO4J_PLUGINS
-          db.env.plugins.value: { get_input: neo4j_plugins }
           storage.neo4j.data.resources.requirements.storage: { get_input: storage_dimension }
           storage.neo4j.logs.resources.requirements.storage: { get_input: storage_dimension }
           storage.yprov.resources.requirements.storage: { get_input: storage_dimension }