Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new galaxy params #219

Merged
merged 3 commits into from
Dec 4, 2024
Merged

Add new galaxy params #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d81555d
Add new galaxy params
micafer Dec 4, 2024
dbcc4cb
Add new galaxy params
micafer Dec 4, 2024
8e8d8b1
Add new galaxy params
micafer Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions custom_types.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,16 @@ node_types:
description: DNS name of the portal
required: false
default: ''
version:
type: string
description: Version of the Galaxy portal
required: false
default: 'latest'
brand:
type: string
description: Brand of the Galaxy portal
required: false
default: 'Galaxy'
requirements:
- lrms:
capability: tosca.capabilities.indigo.LRMS
Expand All @@ -941,6 +951,8 @@ node_types:
galaxy_lrms: { get_property: [ SELF, lrms, type ] }
galaxy_server_name: { get_attribute: [ HOST, private_address, 0 ] }
galaxy_dns_name: { get_property: [ SELF, dns_name ] }
galaxy_image_version: { get_property: [ SELF, version ] }
galaxy_brand: { get_property: [ SELF, brand ] }

tosca.nodes.indigo.GalaxyWN:
derived_from: tosca.nodes.SoftwareComponent
Expand Down
16 changes: 14 additions & 2 deletions templates/galaxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
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.

metadata:
template_version: "1.1.0"
template_version: "1.2.0"
template_name: Galaxy
display_name: Deploy a Galaxy portal
icon: images/galaxy.png
Expand All @@ -27,6 +27,16 @@ topology_template:
type: string
description: Password of the Galaxy admin user
default: adminpass
brand:
type: string
description: Brand of the Galaxy portal
default: Galaxy
version:
type: string
description: Version of the Galaxy portal
default: '24.1'
constraints:
- valid_values: [ '24.1' ]

dns_name:
type: string
Expand All @@ -51,6 +61,8 @@ topology_template:
admin_email: { get_input: admin_email }
admin_password: { get_input: admin_password }
dns_name: { get_input: dns_name }
brand: { get_input: brand }
version: { get_input: version }
requirements:
- lrms: local_lrms
- host: simple_node
Expand Down
2 changes: 1 addition & 1 deletion templates/simple-node-disk.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Loading