From 18420e32099a1fa3e97c2bffae6458ff6b9f07c5 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 19 Nov 2024 16:18:29 +0100 Subject: [PATCH 1/3] Update galaxy --- custom_types.yaml | 6 ++++++ templates/galaxy.yaml | 15 +++++++++++++-- templates/slurm_galaxy.yml | 25 ++++++++++++++++++------- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/custom_types.yaml b/custom_types.yaml index 72cf1f0..40a2611 100644 --- 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 index 67a542b..5756208 100644 --- a/templates/galaxy.yaml +++ b/templates/galaxy.yaml @@ -28,6 +28,11 @@ 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: @@ -35,11 +40,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 } + dns_name: { get_input: dns_name } requirements: - lrms: local_lrms - host: simple_node diff --git a/templates/slurm_galaxy.yml b/templates/slurm_galaxy.yml index 0cd956f..06f939e 100644 --- a/templates/slurm_galaxy.yml +++ b/templates/slurm_galaxy.yml @@ -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: admin@admin.com - 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 From f3fe8d1ec683a63dd458cba7d8d0b3877a9b3f78 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 19 Nov 2024 16:21:16 +0100 Subject: [PATCH 2/3] Use devel branch --- templates/galaxy.yaml | 2 +- templates/slurm_galaxy.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/galaxy.yaml b/templates/galaxy.yaml index 5756208..49b2e18 100644 --- 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. diff --git a/templates/slurm_galaxy.yml b/templates/slurm_galaxy.yml index 06f939e..d520641 100644 --- 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. From d1934cc6793ed418632035a0fce95e704f733829 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 19 Nov 2024 16:29:30 +0100 Subject: [PATCH 3/3] Use devel branch --- templates/simple-node-disk.yml | 2 +- templates/slurm_cluster.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/simple-node-disk.yml b/templates/simple-node-disk.yml index 09de6de..c5ff1ef 100644 --- 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 index b8ad950..0743645 100644 --- 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.