diff --git a/custom_types.yaml b/custom_types.yaml index 40a2611..4f78a26 100644 --- a/custom_types.yaml +++ b/custom_types.yaml @@ -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 @@ -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 diff --git a/templates/galaxy.yaml b/templates/galaxy.yaml index bb56be1..380fdd8 100644 --- a/templates/galaxy.yaml +++ b/templates/galaxy.yaml @@ -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 @@ -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 @@ -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 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.