Merge pull request #210 from grycap/devel

Update galaxy
grycap · Nov 19, 2024 · 2bf955b · 2bf955b
2 parents e91c5db + d1934cc
commit 2bf955b
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 13 deletions.
diff --git a/custom_types.yaml b/custom_types.yaml
@@ -911,6 +911,11 @@ node_types:
         description: Password of the admin user
         default: adminpass
         required: false
+      dns_name:
+        type: string
+        description: DNS name of the portal
+        required: false
+        default: ''
     requirements:
       - lrms:
           capability: tosca.capabilities.indigo.LRMS
@@ -935,6 +940,7 @@ node_types:
             galaxy_admin_password: { get_property: [ SELF, admin_password ] }
             galaxy_lrms: { get_property: [ SELF, lrms, type ] }
             galaxy_server_name: { get_attribute: [ HOST, private_address, 0 ] }
+            galaxy_dns_name: { get_property: [ SELF, dns_name ] }
 
   tosca.nodes.indigo.GalaxyWN:
     derived_from: tosca.nodes.SoftwareComponent

diff --git a/templates/galaxy.yaml b/templates/galaxy.yaml
@@ -1,7 +1,7 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-  - grycap_custom_types: https://raw.githubusercontent.com/grycap/tosca/main/custom_types.yaml
+  - grycap_custom_types: https://raw.githubusercontent.com/grycap/tosca/devel/custom_types.yaml
 
 description: Deploy a Galaxy Server using a local LRMS.
 
@@ -28,18 +28,29 @@ topology_template:
       description: Password of the Galaxy admin user
       default: adminpass
 
+    dns_name:
+      type: string
+      description: DNS name of the Galaxy portal
+      default: ''
+
   node_templates:
 
     galaxy_portal:
       type: tosca.nodes.indigo.GalaxyPortal
       capabilities:
         endpoint:
           properties:
-            port: 8443
-            protocol: tcp
+            ports:
+              https:
+                protocol: tcp
+                source: 443
+              http:
+                protocol: tcp
+                source: 80
       properties:
         admin_email: { get_input: admin_email }
         admin_password: { get_input: admin_password }
+        dns_name: { get_input: dns_name }
       requirements:
         - lrms: local_lrms
         - host: simple_node

diff --git a/templates/simple-node-disk.yml b/templates/simple-node-disk.yml
@@ -1,7 +1,7 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-  - grycap_custom_types: https://raw.githubusercontent.com/grycap/tosca/main/custom_types.yaml
+  - grycap_custom_types: https://raw.githubusercontent.com/grycap/tosca/devel/custom_types.yaml
 
 description: >
   Deploy a compute node getting the IP and SSH credentials to access via ssh with an extra HD disk.

diff --git a/templates/slurm_cluster.yml b/templates/slurm_cluster.yml
@@ -1,7 +1,7 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-  - grycap_custom_types: https://raw.githubusercontent.com/grycap/tosca/main/custom_types.yaml
+  - grycap_custom_types: https://raw.githubusercontent.com/grycap/tosca/devel/custom_types.yaml
 
 description: Deploy a SLURM Virtual Cluster.
 

diff --git a/templates/slurm_galaxy.yml b/templates/slurm_galaxy.yml
@@ -1,7 +1,7 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-  - grycap_custom_types: https://raw.githubusercontent.com/grycap/tosca/main/custom_types.yaml
+  - grycap_custom_types: https://raw.githubusercontent.com/grycap/tosca/devel/custom_types.yaml
 
 description: Deploy a Galaxy portal with an SLURM Virtual Cluster.
 
@@ -13,19 +13,24 @@ metadata:
   parents:
     - slurm_cluster.yml
   tabs:
-    Galaxy Data: admin_.*
+    Galaxy Data: galaxy_.*
 
 topology_template:
   inputs:
 
-    admin_email:
+    galaxy_admin_email:
       type: string
       description: Email of the Galaxy admin user
       default: [email protected]
-    admin_password:
+    galaxy_admin_password:
       type: string
       description: Password of the Galaxy admin user
       default: adminpass
+    galaxy_dns_name:
+      type: string
+      description: DNS name of the Galaxy portal
+      default: ''
+
 
     slurm_version:
       type: string
@@ -63,11 +68,17 @@ topology_template:
       capabilities:
         endpoint:
           properties:
-            port: 8443
-            protocol: tcp
+            ports:
+              https:
+                protocol: tcp
+                source: 443
+              http:
+                protocol: tcp
+                source: 80
       properties:
-        admin_email: { get_input: admin_email }
-        admin_password: { get_input: admin_password }
+        admin_email: { get_input: galaxy_admin_email }
+        admin_password: { get_input: galaxy_admin_password }
+        dns_name: { get_input: galaxy_dns_name }
       requirements:
         - lrms: lrms_front_end
         - host: lrms_server