feat(ansible): Nomad update

Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I67563590ea44c3d59090dc66acd4ef64f8a05f45

12 files changed, 168 insertions, 60 deletions

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.23.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.23.yaml
index 68c62def64..45b788f9fc 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.23.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.23.yaml
@@ -18,13 +18,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_server_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_server_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
@@ -38,6 +39,11 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
   fingerprint.network.disallow_link_local: true
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.30.51.26"
   - "10.30.51.24"
@@ -52,7 +58,7 @@ nomad_volumes:
     read_only: false
 
 # Consul settings.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
@@ -62,7 +68,7 @@ consul_certificates:
     dest: "{{ consul_key_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "both"
 consul_retry_servers:
   - "10.30.51.26"
@@ -70,6 +76,9 @@ consul_retry_servers:
   - "10.30.51.25"
 consul_service_mgr: "systemd"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker daemon settings.
 docker_daemon:
   dns: ["172.17.0.1"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
index c14c67dded..f76dc33da6 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
@@ -18,13 +18,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_server_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_server_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
@@ -38,6 +39,11 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
   fingerprint.network.disallow_link_local: true
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.30.51.23"
   - "10.30.51.26"
@@ -52,7 +58,7 @@ nomad_volumes:
     read_only: false
 
 # Consul settigs.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
@@ -62,7 +68,7 @@ consul_certificates:
     dest: "{{ consul_key_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "both"
 consul_retry_servers:
   - "10.30.51.23"
@@ -70,6 +76,9 @@ consul_retry_servers:
   - "10.30.51.25"
 consul_service_mgr: "systemd"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker daemon settings.
 docker_daemon:
   dns: ["172.17.0.1"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
index eedc711056..75461dca23 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
@@ -18,13 +18,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_server_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_server_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
@@ -38,6 +39,11 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
   fingerprint.network.disallow_link_local: true
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.30.51.23"
   - "10.30.51.24"
@@ -52,7 +58,7 @@ nomad_volumes:
     read_only: false
 
 # Consul settigs.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
@@ -62,7 +68,7 @@ consul_certificates:
     dest: "{{ consul_key_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "both"
 consul_retry_servers:
   - "10.30.51.23"
@@ -70,6 +76,9 @@ consul_retry_servers:
   - "10.30.51.26"
 consul_service_mgr: "systemd"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker daemon settings.
 docker_daemon:
   dns: ["172.17.0.1"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
index bb1206a168..deb56da5c4 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
@@ -18,13 +18,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_server_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_server_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
@@ -38,6 +39,11 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
   fingerprint.network.disallow_link_local: true
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.30.51.23"
   - "10.30.51.24"
@@ -52,7 +58,7 @@ nomad_volumes:
     read_only: false
 
 # Consul settigs.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
@@ -62,7 +68,7 @@ consul_certificates:
     dest: "{{ consul_key_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "both"
 consul_retry_servers:
   - "10.30.51.23"
@@ -70,6 +76,9 @@ consul_retry_servers:
   - "10.30.51.25"
 consul_service_mgr: "systemd"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker daemon settings.
 docker_daemon:
   dns: ["172.17.0.1"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.27.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.27.yaml
index b5947d668c..2279dbcf5c 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.27.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.27.yaml
@@ -18,13 +18,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_client_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_client_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
 nomad_node_role: "client"
@@ -36,6 +37,11 @@ nomad_options:
   docker.volumes.enabled: true
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.30.51.23"
   - "10.30.51.24"
@@ -46,13 +52,13 @@ nomad_servers:
   - "10.30.51.25:4647"
 
 # Consul settigs.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
   - "10.30.51.23"
@@ -60,6 +66,9 @@ consul_retry_servers:
   - "10.30.51.25"
 consul_service_mgr: "systemd"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker daemon settings.
 docker_daemon:
   dns: ["172.17.0.1"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
index 47f967c2f3..e938133a47 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
@@ -18,13 +18,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_client_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_client_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
 nomad_node_role: "client"
@@ -36,6 +37,11 @@ nomad_options:
   docker.volumes.enabled: true
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.30.51.23"
   - "10.30.51.24"
@@ -46,13 +52,13 @@ nomad_servers:
   - "10.30.51.25:4647"
 
 # Consul settigs.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
   - "10.30.51.23"
@@ -60,6 +66,9 @@ consul_retry_servers:
   - "10.30.51.25"
 consul_service_mgr: "systemd"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker daemon settings.
 docker_daemon:
   dns: ["172.17.0.1"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
index f981504de5..8fe6b9909d 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
@@ -26,13 +26,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_client_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_client_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
 nomad_node_role: "client"
@@ -44,6 +45,11 @@ nomad_options:
   docker.volumes.enabled: true
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.32.8.15"
   - "10.32.8.16"
@@ -54,13 +60,13 @@ nomad_servers:
   - "10.32.8.17:4647"
 
 # Consul settigs.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
   - "10.32.8.15"
@@ -68,6 +74,9 @@ consul_retry_servers:
   - "10.32.8.17"
 consul_service_mgr: "systemd"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker settings.
 docker_daemon:
   default-shm-size: "1073741824"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
index ea30bf4c60..b741ee4437 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
@@ -26,13 +26,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_client_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_client_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
 nomad_node_role: "client"
@@ -44,6 +45,11 @@ nomad_options:
   docker.volumes.enabled: true
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.32.8.15"
   - "10.32.8.16"
@@ -54,13 +60,13 @@ nomad_servers:
   - "10.32.8.17:4647"
 
 # Consul settigs.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
   - "10.32.8.15"
@@ -68,6 +74,9 @@ consul_retry_servers:
   - "10.32.8.17"
 consul_service_mgr: "systemd"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker settings.
 docker_daemon:
   default-shm-size: "1073741824"
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
index 408f9fb39d..a07409c428 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
@@ -28,13 +28,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_client_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_client_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
 nomad_node_role: "client"
@@ -46,6 +47,11 @@ nomad_options:
   docker.volumes.enabled: true
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.30.51.23"
   - "10.30.51.24"
@@ -57,13 +63,13 @@ nomad_servers:
 nomad_cpu_total_compute: "40000"
 
 # Consul settigs.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
   - "10.30.51.23"
@@ -71,6 +77,9 @@ consul_retry_servers:
   - "10.30.51.25"
 consul_service_mgr: "systemd"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker settings.
 docker_daemon:
   dns: ["172.17.0.1"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
index aaaee4dce4..db1efbfa3e 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
@@ -28,13 +28,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_client_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_client_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
 nomad_node_role: "client"
@@ -46,6 +47,11 @@ nomad_options:
   docker.volumes.enabled: true
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.30.51.23"
   - "10.30.51.24"
@@ -57,13 +63,13 @@ nomad_servers:
 nomad_cpu_total_compute: "40000"
 
 # Consul settigs.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
   - "10.30.51.23"
@@ -71,6 +77,9 @@ consul_retry_servers:
   - "10.30.51.25"
 consul_service_mgr: "systemd"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker settings.
 docker_daemon:
   dns: ["172.17.0.1"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml
index ba92e5e42b..4214df8a61 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml
@@ -19,13 +19,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_client_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_client_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
 nomad_node_role: "client"
@@ -37,6 +38,11 @@ nomad_options:
   docker.volumes.enabled: true
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.30.51.23"
   - "10.30.51.24"
@@ -47,13 +53,13 @@ nomad_servers:
   - "10.30.51.25:4647"
 
 # Consul settings.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
   - "10.30.51.23"
@@ -62,6 +68,9 @@ consul_retry_servers:
 consul_service_mgr: "systemd"
 #consul_package_version: "1.5.2+dfsg2-14"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker daemon settings.
 docker_daemon:
   dns: ["172.17.0.1"]
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml
index 971393ca89..98c7acfb8a 100644
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml
@@ -19,13 +19,14 @@ users:
 sshd_disable_password_login: true
 
 # Nomad settings.
+nomad_version: "1.6.1"
 nomad_certificates:
   - src: "{{ file_nomad_ca_pem }}"
-    dest: "{{ nomad_ca_file }}"
+    dest: "{{ nomad_tls_ca_file }}"
   - src: "{{ file_nomad_client_pem }}"
-    dest: "{{ nomad_cert_file }}"
+    dest: "{{ nomad_tls_cert_file }}"
   - src: "{{ file_nomad_client_key_pem }}"
-    dest: "{{ nomad_key_file }}"
+    dest: "{{ nomad_tls_key_file }}"
 nomad_datacenter: "yul1"
 nomad_node_name: "{{ hostname }}-{{ ansible_architecture }}"
 nomad_node_role: "client"
@@ -37,6 +38,11 @@ nomad_options:
   docker.volumes.enabled: true
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
+nomad_consul_use_ssl: false
+nomad_use_tls: false
+nomad_tls_http: false
+nomad_tls_rpc: false
+nomad_use_vault: false
 nomad_retry_servers:
   - "10.30.51.23"
   - "10.30.51.24"
@@ -47,13 +53,13 @@ nomad_servers:
   - "10.30.51.25:4647"
 
 # Consul settings.
-consul_nomad_integration: true
+nomad_use_consul: true
 consul_certificates:
   - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
 consul_datacenter: "yul1"
 consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
-consul_node_name: "{{ hostname }}"
+consul_node_name: "{{ ansible_hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
   - "10.30.51.23"
@@ -62,6 +68,9 @@ consul_retry_servers:
 consul_service_mgr: "systemd"
 #consul_package_version: "1.5.2+dfsg2-14"
 
+# Vault settings.
+vault_version: "1.13.1"
+
 # Docker daemon settings.
 docker_daemon:
   dns: ["172.17.0.1"]