From 6c982d947e7594b0766697ef286794df794e5bc4 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 3 Dec 2024 11:08:17 +0100 Subject: [PATCH 1/3] Update domain name --- templates/nomad_ai4eosc.yaml | 2 +- templates/nomad_ai4eosc_join.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/nomad_ai4eosc.yaml b/templates/nomad_ai4eosc.yaml index 198cce2..bf13fe2 100644 --- a/templates/nomad_ai4eosc.yaml +++ b/templates/nomad_ai4eosc.yaml @@ -146,7 +146,7 @@ topology_template: nomad_dc: type: string description: Nomad datacenter name - default: ifca-ai4os + default: ifca-ai4eosc required: yes nomad_domain: type: string diff --git a/templates/nomad_ai4eosc_join.yaml b/templates/nomad_ai4eosc_join.yaml index 16b7960..4c35f04 100644 --- a/templates/nomad_ai4eosc_join.yaml +++ b/templates/nomad_ai4eosc_join.yaml @@ -175,7 +175,7 @@ topology_template: consul_join_datacenter: type: string description: Primary datacenter of the Consul cluster to join - default: 'ifca-ai4os' + default: 'ifca-ai4eosc' node_templates: From 37e9da31dc3df8816016f7684ba6733edf6e29d8 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Tue, 3 Dec 2024 12:06:36 +0100 Subject: [PATCH 2/3] Update versions --- templates/nomad_ai4eosc_join.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/nomad_ai4eosc_join.yaml b/templates/nomad_ai4eosc_join.yaml index 4c35f04..f5e457f 100644 --- a/templates/nomad_ai4eosc_join.yaml +++ b/templates/nomad_ai4eosc_join.yaml @@ -139,17 +139,17 @@ topology_template: consul_version: type: string description: Consul version to install - default: 1.17.1 + default: 1.19.2 required: yes nomad_version: type: string description: Nomad version to install - default: 1.7.3 + default: 1.9.1 required: yes nomad_dc: type: string description: Nomad datacenter name - default: ifca-ai4os-new + default: ifca-ai4eosc-new required: yes nomad_domain: type: string From 4047d33e10549191ec56370478c666ee97fa380a Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 4 Dec 2024 08:27:40 +0100 Subject: [PATCH 3/3] Fix output --- templates/galaxy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/galaxy.yaml b/templates/galaxy.yaml index 1ed1267..bb56be1 100644 --- a/templates/galaxy.yaml +++ b/templates/galaxy.yaml @@ -63,6 +63,6 @@ topology_template: outputs: galaxy_nip_url: - value: { concat: [ 'https://galaxy.', get_attribute: [ simple_node, public_address, 0 ], 'nip.io/' ] } + value: { concat: [ 'https://galaxy.', get_attribute: [ simple_node, public_address, 0 ], '.nip.io/' ] } galaxy_dns_url: value: { concat: [ 'https://', { get_input: dns_name }, '/' ] }