From d74ad832ea8eb84d08e3c21bb5ae62207ce51e55 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 20 Nov 2024 09:07:49 +0100 Subject: [PATCH 1/2] Add new output --- templates/galaxy.yaml | 8 +++++--- templates/slurm_galaxy.yml | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/templates/galaxy.yaml b/templates/galaxy.yaml index 5756208..5f7bd2f 100644 --- a/templates/galaxy.yaml +++ b/templates/galaxy.yaml @@ -30,7 +30,7 @@ topology_template: dns_name: type: string - description: DNS name of the Galaxy portal + description: DNS name of the Galaxy portal (leave empty to use galaxy..nip.io) default: '' node_templates: @@ -62,5 +62,7 @@ topology_template: - host: simple_node outputs: - galaxy_url: - value: { concat: [ 'https://', get_attribute: [ simple_node, public_address, 0 ], ':8443/' ] } + galaxy_nip_url: + value: { concat: [ 'https://galaxy.', get_attribute: [ simple_node, public_address, 0 ], 'nip.io/' ] } + galaxy_dns_url: + value: { concat: [ 'https://', { get_input: dns_name }, '/' ] } \ No newline at end of file diff --git a/templates/slurm_galaxy.yml b/templates/slurm_galaxy.yml index 06f939e..fde7171 100644 --- a/templates/slurm_galaxy.yml +++ b/templates/slurm_galaxy.yml @@ -28,7 +28,7 @@ topology_template: default: adminpass galaxy_dns_name: type: string - description: DNS name of the Galaxy portal + description: DNS name of the Galaxy portal (leave empty to use galaxy..nip.io) default: '' @@ -92,5 +92,7 @@ topology_template: - dependency: galaxy_portal outputs: - galaxy_url: - value: { concat: [ 'https://', get_attribute: [ lrms_server, public_address, 0 ], ':8443/' ] } + galaxy_nip_url: + value: { concat: [ 'https://galaxy.', get_attribute: [ simple_node, public_address, 0 ], 'nip.io/' ] } + galaxy_dns_url: + value: { concat: [ 'https://', { get_input: dns_name }, '/' ] } From 5466f29d4da0026cd0400b543858a9018f4d43ea Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 20 Nov 2024 09:17:12 +0100 Subject: [PATCH 2/2] Fix style --- templates/galaxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/galaxy.yaml b/templates/galaxy.yaml index 5f7bd2f..ea4095a 100644 --- a/templates/galaxy.yaml +++ b/templates/galaxy.yaml @@ -65,4 +65,4 @@ topology_template: galaxy_nip_url: value: { concat: [ 'https://galaxy.', get_attribute: [ simple_node, public_address, 0 ], 'nip.io/' ] } galaxy_dns_url: - value: { concat: [ 'https://', { get_input: dns_name }, '/' ] } \ No newline at end of file + value: { concat: [ 'https://', { get_input: dns_name }, '/' ] }