feat(ansible): Migrate Ubuntu Jammy IV.

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: Ia48ee3f9bbcdfd7b85968362b1fb7f816dcd97be

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
index e53467c..90a7f1b 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
@@ -37,13 +37,13 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 nomad_servers:
-  - "10.32.8.15:4647"
-  - "10.32.8.16:4647"
-  - "10.32.8.17:4647"
+  - "10.30.51.23:4647"
+  - "10.30.51.24:4647"
+  - "10.30.51.25:4647"
 
 # Consul settigs.
 consul_nomad_integration: true
@@ -55,9 +55,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 consul_service_mgr: "systemd"
 
 # Docker daemon settings.

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
index 9ca2860..bcc4439 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
@@ -37,13 +37,13 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 nomad_servers:
-  - "10.32.8.15:4647"
-  - "10.32.8.16:4647"
-  - "10.32.8.17:4647"
+  - "10.30.51.23:4647"
+  - "10.30.51.24:4647"
+  - "10.30.51.25:4647"
 
 # Consul settigs.
 consul_nomad_integration: true
@@ -55,9 +55,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 consul_service_mgr: "systemd"
 
 

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
index 29c19c3..cb643b9 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
@@ -37,13 +37,13 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 nomad_servers:
-  - "10.32.8.15:4647"
-  - "10.32.8.16:4647"
-  - "10.32.8.17:4647"
+  - "10.30.51.23:4647"
+  - "10.30.51.24:4647"
+  - "10.30.51.25:4647"
 
 # Consul settigs.
 consul_nomad_integration: true
@@ -55,9 +55,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 consul_service_mgr: "systemd"
 
 

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.19.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.19.yaml
index b03561d..62edabf 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.19.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.19.yaml
@@ -37,13 +37,13 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 nomad_servers:
-  - "10.32.8.15:4647"
-  - "10.32.8.16:4647"
-  - "10.32.8.17:4647"
+  - "10.30.51.23:4647"
+  - "10.30.51.24:4647"
+  - "10.30.51.25:4647"
 
 # Consul settigs.
 consul_nomad_integration: true
@@ -55,9 +55,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 consul_service_mgr: "systemd"
 
 

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
index 36ddf20..8055eec 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
@@ -37,13 +37,13 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 nomad_servers:
-  - "10.32.8.15:4647"
-  - "10.32.8.16:4647"
-  - "10.32.8.17:4647"
+  - "10.30.51.23:4647"
+  - "10.30.51.24:4647"
+  - "10.30.51.25:4647"
 
 # Consul settigs.
 consul_nomad_integration: true
@@ -55,9 +55,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 consul_service_mgr: "systemd"
 
 # Docker daemon settings.

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
index 4ed2cc7..0bcbaed 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
@@ -37,13 +37,13 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 nomad_servers:
-  - "10.32.8.15:4647"
-  - "10.32.8.16:4647"
-  - "10.32.8.17:4647"
+  - "10.30.51.23:4647"
+  - "10.30.51.24:4647"
+  - "10.30.51.25:4647"
 
 # Consul settigs.
 consul_nomad_integration: true
@@ -55,9 +55,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 consul_service_mgr: "systemd"
 
 # Docker daemon settings.

diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
index ebf547c..9364464 100644 (file)
--- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
+++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
@@ -37,13 +37,13 @@ nomad_options:
   driver.whitelist: "docker,raw_exec,exec"
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 nomad_servers:
-  - "10.32.8.15:4647"
-  - "10.32.8.16:4647"
-  - "10.32.8.17:4647"
+  - "10.30.51.23:4647"
+  - "10.30.51.24:4647"
+  - "10.30.51.25:4647"
 
 # Consul settigs.
 consul_nomad_integration: true
@@ -55,9 +55,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "client"
 consul_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 consul_service_mgr: "systemd"
 
 

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 b9aa7c3..b0a9509 100644 (file)
--- 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
@@ -39,13 +39,13 @@ nomad_options:
   fingerprint.network.disallow_link_local: true
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.26"
+  - "10.30.51.24"
+  - "10.30.51.25"
 nomad_servers:
-  - "10.32.8.15:4647"
-  - "10.32.8.16:4647"
-  - "10.32.8.17:4647"
+  - "10.30.51.26:4647"
+  - "10.30.51.24:4647"
+  - "10.30.51.25:4647"
 nomad_volumes:
   - name: "prod-volume-data1-1"
     path: "/data"
@@ -65,9 +65,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "both"
 consul_retry_servers:
-  - "10.32.8.15"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.26"
+  - "10.30.51.24"
+  - "10.30.51.25"
 consul_service_mgr: "systemd"
 
 # Docker daemon settings.

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 5069a1b..b798171 100644 (file)
--- 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
@@ -39,13 +39,13 @@ nomad_options:
   fingerprint.network.disallow_link_local: true
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.14"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.26"
+  - "10.30.51.25"
 nomad_servers:
-  - "10.32.8.14:4647"
-  - "10.32.8.16:4647"
-  - "10.32.8.17:4647"
+  - "10.30.51.23:4647"
+  - "10.30.51.26:4647"
+  - "10.30.51.25:4647"
 nomad_volumes:
   - name: "prod-volume-data1-1"
     path: "/data"
@@ -65,9 +65,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "both"
 consul_retry_servers:
-  - "10.32.8.14"
-  - "10.32.8.16"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.26"
+  - "10.30.51.25"
 consul_service_mgr: "systemd"
 
 # Docker daemon settings.

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 f9da427..ba84722 100644 (file)
--- 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
@@ -39,13 +39,13 @@ nomad_options:
   fingerprint.network.disallow_link_local: true
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.14"
-  - "10.32.8.15"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.26"
 nomad_servers:
-  - "10.32.8.14:4647"
-  - "10.32.8.15:4647"
-  - "10.32.8.17:4647"
+  - "10.30.51.23:4647"
+  - "10.30.51.24:4647"
+  - "10.30.51.26:4647"
 nomad_volumes:
   - name: "prod-volume-data1-1"
     path: "/data"
@@ -65,9 +65,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "both"
 consul_retry_servers:
-  - "10.32.8.14"
-  - "10.32.8.15"
-  - "10.32.8.17"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.26"
 consul_service_mgr: "systemd"
 
 # Docker daemon settings.

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 27f9e46..1ad441b 100644 (file)
--- 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
@@ -39,13 +39,13 @@ nomad_options:
   fingerprint.network.disallow_link_local: true
 nomad_service_mgr: "systemd"
 nomad_retry_servers:
-  - "10.32.8.14"
-  - "10.32.8.15"
-  - "10.32.8.16"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 nomad_servers:
-  - "10.32.8.14:4647"
-  - "10.32.8.15:4647"
-  - "10.32.8.16:4647"
+  - "10.30.51.23:4647"
+  - "10.30.51.24:4647"
+  - "10.30.51.25:4647"
 nomad_volumes:
   - name: "prod-volume-data1-1"
     path: "/data"
@@ -65,9 +65,9 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ=="
 consul_node_name: "{{ hostname }}"
 consul_node_role: "both"
 consul_retry_servers:
-  - "10.32.8.14"
-  - "10.32.8.15"
-  - "10.32.8.16"
+  - "10.30.51.23"
+  - "10.30.51.24"
+  - "10.30.51.25"
 consul_service_mgr: "systemd"
 
 # Docker daemon settings.

diff --git a/fdio.infra.ansible/roles/nomad/tasks/main.yaml b/fdio.infra.ansible/roles/nomad/tasks/main.yaml
index 480c4da..0204c05 100644 (file)
--- a/fdio.infra.ansible/roles/nomad/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/nomad/tasks/main.yaml
@@ -186,10 +186,10 @@
     line: "{{ item }}"
     create: true
   loop:
-    - "export NOMAD_ADDR=https://nomad.service.consul:4646"
+    - "export NOMAD_ADDR=http://nomad.service.consul:4646"
     - "export NOMAD_CACERT={{ nomad_ca_file }}"
-    - "export NOMAD_CLIENT_CERT={{ nomad_cli_cert_file }}"
-    - "export NOMAD_CLIENT_KEY={{ nomad_cli_key_file }}"
+#    - "export NOMAD_CLIENT_CERT={{ nomad_cli_cert_file }}"
+#    - "export NOMAD_CLIENT_KEY={{ nomad_cli_key_file }}"
   tags:
     - nomad-conf
 

diff --git a/fdio.infra.ansible/roles/nomad/templates/server.hcl.j2 b/fdio.infra.ansible/roles/nomad/templates/server.hcl.j2
index f0ab223..570d92e 100644 (file)
--- a/fdio.infra.ansible/roles/nomad/templates/server.hcl.j2
+++ b/fdio.infra.ansible/roles/nomad/templates/server.hcl.j2
@@ -4,6 +4,7 @@ server {
     {% if nomad_node_server | bool -%}
         bootstrap_expect = {{ nomad_bootstrap_expect }}
     {%- endif %}
+
     {% if nomad_node_server | bool -%}
         raft_protocol = 3
     {%- endif %}