Merge pull request #166 from grycap/devel

Devel
grycap · Jul 9, 2024 · 19fb43e · 19fb43e
2 parents ea7c4b3 + deb9c1e
commit 19fb43e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 13 deletions.
diff --git a/artifacts/lrms/nomad_ai4eosc_fe_install.yml b/artifacts/lrms/nomad_ai4eosc_fe_install.yml
@@ -161,8 +161,17 @@
 
     - name: Set facts
       set_fact:
-        consul_public_ip: "{{ server_list[0] }}"
+        consul_servers_ip: "{{ server_list}}"
+      when: consul_join == ''
+
+    - name: Set facts
+      set_fact:
         consul_servers_ip: "{{ [ consul_join ] }}"
+      when: consul_join != ''
+
+    - name: Set facts
+      set_fact:
+        consul_public_ip: "{{ server_list[0] }}"
         my_ip: "{{ server_private_ip }}"
         my_public_ip: "{{ server_public_ip }}"
         username: cloudadm

diff --git a/templates/nomad_ai4eosc.yaml b/templates/nomad_ai4eosc.yaml
@@ -172,6 +172,15 @@ topology_template:
               port_4646:
                 protocol: tcp
                 source: 4646
+              port_4647:
+                protocol: tcp
+                source: 4647
+              port_4648:
+                protocol: tcp
+                source: 4648
+              port_4648u:
+                protocol: udp
+                source: 4648
               port_8501:
                 protocol: tcp
                 source: 8501
@@ -184,12 +193,9 @@ topology_template:
               port_8302:
                 protocol: tcp
                 source: 8302
-              port_80:
-                protocol: tcp
-                source: 80
-              port_443:
-                protocol: tcp
-                source: 443
+              port_8302u:
+                protocol: udp
+                source: 8302
       requirements:
         - host: front
       interfaces:

diff --git a/templates/nomad_ai4eosc_join.yaml b/templates/nomad_ai4eosc_join.yaml
@@ -188,18 +188,30 @@ topology_template:
               port_4646:
                 protocol: tcp
                 source: 4646
+              port_4647:
+                protocol: tcp
+                source: 4647
+              port_4648:
+                protocol: tcp
+                source: 4648
+              port_4648u:
+                protocol: udp
+                source: 4648
               port_8501:
                 protocol: tcp
                 source: 8501
-              port_8302:
+              port_8300:
                 protocol: tcp
-                source: 8302
-              port_80:
+                source: 8300
+              port_8301:
                 protocol: tcp
-                source: 80
-              port_443:
+                source: 8301
+              port_8302:
                 protocol: tcp
-                source: 443
+                source: 8302
+              port_8302u:
+                protocol: udp
+                source: 8302
       requirements:
         - host: front
       interfaces: