Merge pull request #164 from grycap/devel

Devel
grycap · Jul 8, 2024 · 15f21a9 · 15f21a9
2 parents 551b01d + a28e837
commit 15f21a9
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/artifacts/lrms/nomad_ai4eosc_fe_install.yml b/artifacts/lrms/nomad_ai4eosc_fe_install.yml
@@ -15,6 +15,13 @@
           - "{{ server_list }}"
       when:
         - server_list is string
+    - name: Set primary_datacenter
+      set_fact:
+        consul_primary_datacenter: "{{ nomad_input_dc | default('ifca-ai4eosc') }}"
+    - name: Set primary_datacenter
+      set_fact:
+        consul_primary_datacenter: "{{ consul_join_datacenter | default('ifca-ai4eosc') }}"
+      when: consul_join != ''
   tasks:
     - name: Install git
       package:
@@ -160,6 +167,7 @@
         path: /opt/cloudadm/
         nomad_dc: "{{ nomad_input_dc | default('ifca-ai4eosc') }}"
         consul_dc_name: "{{ nomad_input_dc | default('ifca-ai4eosc') }}"
+        primary_datacenter: "{{ consul_primary_datacenter }}"
         domain: "{{ nomad_input_domain | default('ifca') }}"
         nomad_namespaces: "{{ nomad_input_namespaces | default(['ai4eosc', 'imagine', 'tutorials']) }}"
         nomad_version: "{{ nomad_input_version | default('1.7.3') }}"

diff --git a/artifacts/lrms/nomad_ai4eosc_wn_install.yml b/artifacts/lrms/nomad_ai4eosc_wn_install.yml
@@ -15,6 +15,13 @@
           - "{{ server_list }}"
       when:
         - server_list is string
+    - name: Set primary_datacenter
+      set_fact:
+        consul_primary_datacenter: "{{ nomad_input_dc | default('ifca-ai4eosc') }}"
+    - name: Set primary_datacenter
+      set_fact:
+        consul_primary_datacenter: "{{ consul_join_datacenter | default('ifca-ai4eosc') }}"
+      when: consul_join != ''
   roles:
     - role: 'grycap.docker'
       docker_nvidia_support: "{{ nvidia_support }}"
@@ -162,6 +169,7 @@
         path: /opt/cloudadm/
         nomad_dc: "{{ nomad_input_dc | default('ifca-ai4eosc') }}"
         consul_dc_name: "{{ nomad_input_dc | default('ifca-ai4eosc') }}"
+        primary_datacenter: "{{ consul_primary_datacenter }}"
         domain: "{{ nomad_input_domain | default('ifca') }}"
         nomad_version: "{{ nomad_input_version | default('1.7.3') }}"
         consul_version: "{{ consul_input_version | default('1.17.1') }}"

diff --git a/templates/nomad_ai4eosc_join.yaml b/templates/nomad_ai4eosc_join.yaml
@@ -24,6 +24,7 @@ metadata:
       - nomad_namespaces
       - consul_cert_url
       - consul_server_join
+      - consul_join_datacenter
 
 topology_template:
   inputs:
@@ -171,6 +172,10 @@ topology_template:
       type: string
       description: IP address of the Consul server to join
       default: ''
+    consul_join_datacenter:
+      type: string
+      description: Primary datacenter of the Consul cluster to join
+      default: 'ifca-ai4eosc'
 
   node_templates:
 
@@ -186,6 +191,9 @@ topology_template:
               port_8501:
                 protocol: tcp
                 source: 8501
+              port_8302:
+                protocol: tcp
+                source: 8302
               port_80:
                 protocol: tcp
                 source: 80
@@ -208,6 +216,7 @@ topology_template:
               nomad_input_namespaces: { get_input: nomad_namespaces }
               consul_cert_url: { get_input: consul_cert_url }
               consul_server_join: { get_input: consul_server_join }
+              consul_join_datacenter: { get_input: consul_join_datacenter }
 
     front:
       type: tosca.nodes.indigo.Compute
@@ -249,6 +258,7 @@ topology_template:
               nomad_input_domain: { get_input: nomad_domain }
               consul_cert_url: { get_input: consul_cert_url }
               consul_server_join: { get_input: consul_server_join }
+              consul_join_datacenter: { get_input: consul_join_datacenter }
 
     wn:
       type: tosca.nodes.indigo.Compute
@@ -290,6 +300,7 @@ topology_template:
               nomad_input_domain: { get_input: nomad_domain }
               consul_cert_url: { get_input: consul_cert_url }
               consul_server_join: { get_input: consul_server_join }
+              consul_join_datacenter: { get_input: consul_join_datacenter }
 
     wn_pub:
       type: tosca.nodes.indigo.Compute
@@ -339,6 +350,7 @@ topology_template:
               nomad_input_domain: { get_input: nomad_domain }
               consul_cert_url: { get_input: consul_cert_url }
               consul_server_join: { get_input: consul_server_join }
+              consul_join_datacenter: { get_input: consul_join_datacenter }
 
     wn_gpu:
       type: tosca.nodes.indigo.Compute