Merge pull request #216 from grycap/devel

Devel
grycap · Dec 2, 2024 · 8252f3f · 8252f3f
2 parents b31d5b9 + 44252a8
commit 8252f3f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/artifacts/ai4eosc.yml b/artifacts/ai4eosc.yml
@@ -24,6 +24,11 @@
         traefik_host: "{{ nsupdate_dns }}"
       when: nsupdate_dns is defined and nsupdate_dns != ""
 
+    - name: Set "ai4oshub/" prefix to image if not set
+      set_fact:
+        image: "ai4oshub/{{ image }}"
+      when: "'/' not in image"
+
     - name: Create docker-compose file
       copy:
         dest: /opt/ai4eosc/docker-compose.yaml
@@ -32,7 +37,7 @@
           version: "3.9"
           services:
             app:
-              image: ai4oshub/{{ image }}
+              image: {{ image }}
               labels:
                 - "traefik.enable=true"
                 - "traefik.http.routers.app.service=app"

diff --git a/artifacts/lrms/nomad_ai4eosc_fe_install.yml b/artifacts/lrms/nomad_ai4eosc_fe_install.yml
@@ -166,6 +166,7 @@
     - name: Set facts
       set_fact:
         consul_servers_ip: "{{ consul_servers_ip + [ consul_join ] }}"
+        from_scratch_cluster_installation: false
       when: consul_join != ''
 
     - name: Set facts

diff --git a/templates/slurm_galaxy.yml b/templates/slurm_galaxy.yml
@@ -93,6 +93,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: [ lrms_server, public_address, 0 ], 'nip.io/' ] }
     galaxy_dns_url:
       value: { concat: [ 'https://', { get_input: galaxy_dns_name }, '/' ] }