From 2c444586dad69f6d3976a72c9e50ef34c306d038 Mon Sep 17 00:00:00 2001 From: pmikus Date: Mon, 4 Sep 2023 10:17:48 +0000 Subject: feat(ansible): Consul upgrade Signed-off-by: pmikus Change-Id: Ifde27d3bd637364e3a1cc56477e79f26f0e57827 --- .../inventories/lf_inventory/host_vars/10.30.51.23.yaml | 7 ++++++- .../inventories/lf_inventory/host_vars/10.30.51.24.yaml | 7 ++++++- .../inventories/lf_inventory/host_vars/10.30.51.25.yaml | 7 ++++++- .../inventories/lf_inventory/host_vars/10.30.51.26.yaml | 7 ++++++- .../inventories/lf_inventory/host_vars/10.30.51.27.yaml | 15 ++++++++++++--- .../inventories/lf_inventory/host_vars/10.30.51.28.yaml | 15 ++++++++++++--- .../inventories/lf_inventory/host_vars/10.30.51.50.yaml | 13 +++++++++++-- .../inventories/lf_inventory/host_vars/10.30.51.51.yaml | 13 +++++++++++-- .../inventories/lf_inventory/host_vars/10.30.51.70.yaml | 13 +++++++++++-- .../inventories/lf_inventory/host_vars/10.30.51.71.yaml | 13 +++++++++++-- .../inventories/lf_inventory/host_vars/10.30.51.91.yaml | 13 +++++++++++-- .../inventories/lf_inventory/host_vars/10.30.51.92.yaml | 13 +++++++++++-- 12 files changed, 114 insertions(+), 22 deletions(-) (limited to 'fdio.infra.ansible/inventories') 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 45b788f9fc..d67fb67a11 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 @@ -66,10 +66,15 @@ consul_certificates: dest: "{{ consul_cert_file }}" - src: "{{ file_consul_server_0_key_pem }}" dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: true consul_datacenter: "yul1" +consul_node_role: "both" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "both" +consul_retry_join: true consul_retry_servers: - "10.30.51.26" - "10.30.51.24" 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 f76dc33da6..a0787354ea 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 @@ -66,10 +66,15 @@ consul_certificates: dest: "{{ consul_cert_file }}" - src: "{{ file_consul_server_1_key_pem }}" dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: true consul_datacenter: "yul1" +consul_node_role: "both" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "both" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.26" 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 75461dca23..52a7bfd06d 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 @@ -66,10 +66,15 @@ consul_certificates: dest: "{{ consul_cert_file }}" - src: "{{ file_consul_server_2_key_pem }}" dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: true consul_datacenter: "yul1" +consul_node_role: "both" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "both" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.24" 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 deb56da5c4..9ca0218230 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 @@ -66,10 +66,15 @@ consul_certificates: dest: "{{ consul_cert_file }}" - src: "{{ file_consul_server_3_key_pem }}" dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: true consul_datacenter: "yul1" +consul_node_role: "both" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "both" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.24" 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 2279dbcf5c..782e918840 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 @@ -51,15 +51,24 @@ nomad_servers: - "10.30.51.24:4647" - "10.30.51.25:4647" -# Consul settigs. +# Consul settings. nomad_use_consul: true consul_certificates: - - src: "{{ file_consul_ca_pem }}" + - src: "{{ file_consul_agent_ca_pem }}" dest: "{{ consul_ca_file }}" + - src: "{{ file_consul_server_0_pem }}" + dest: "{{ consul_cert_file }}" + - src: "{{ file_consul_server_0_key_pem }}" + dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: false consul_datacenter: "yul1" +consul_node_role: "client" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "client" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.24" 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 e938133a47..f72d565191 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 @@ -51,15 +51,24 @@ nomad_servers: - "10.30.51.24:4647" - "10.30.51.25:4647" -# Consul settigs. +# Consul settings. nomad_use_consul: true consul_certificates: - - src: "{{ file_consul_ca_pem }}" + - src: "{{ file_consul_agent_ca_pem }}" dest: "{{ consul_ca_file }}" + - src: "{{ file_consul_server_0_pem }}" + dest: "{{ consul_cert_file }}" + - src: "{{ file_consul_server_0_key_pem }}" + dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: false consul_datacenter: "yul1" +consul_node_role: "client" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "client" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.24" 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 37d1cba285..6c5f800cc9 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 @@ -62,12 +62,21 @@ nomad_servers: # Consul settigs. nomad_use_consul: true consul_certificates: - - src: "{{ file_consul_ca_pem }}" + - src: "{{ file_consul_agent_ca_pem }}" dest: "{{ consul_ca_file }}" + - src: "{{ file_consul_server_0_pem }}" + dest: "{{ consul_cert_file }}" + - src: "{{ file_consul_server_0_key_pem }}" + dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: false consul_datacenter: "yul1" +consul_node_role: "client" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "client" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.24" 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 0aac83fe23..1473bee88c 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 @@ -62,12 +62,21 @@ nomad_servers: # Consul settigs. nomad_use_consul: true consul_certificates: - - src: "{{ file_consul_ca_pem }}" + - src: "{{ file_consul_agent_ca_pem }}" dest: "{{ consul_ca_file }}" + - src: "{{ file_consul_server_0_pem }}" + dest: "{{ consul_cert_file }}" + - src: "{{ file_consul_server_0_key_pem }}" + dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: false consul_datacenter: "yul1" +consul_node_role: "client" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "client" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.24" 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 a07409c428..ab533c02bb 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 @@ -65,12 +65,21 @@ nomad_cpu_total_compute: "40000" # Consul settigs. nomad_use_consul: true consul_certificates: - - src: "{{ file_consul_ca_pem }}" + - src: "{{ file_consul_agent_ca_pem }}" dest: "{{ consul_ca_file }}" + - src: "{{ file_consul_server_0_pem }}" + dest: "{{ consul_cert_file }}" + - src: "{{ file_consul_server_0_key_pem }}" + dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: false consul_datacenter: "yul1" +consul_node_role: "client" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "client" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.24" 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 db1efbfa3e..1ac36623eb 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 @@ -65,12 +65,21 @@ nomad_cpu_total_compute: "40000" # Consul settigs. nomad_use_consul: true consul_certificates: - - src: "{{ file_consul_ca_pem }}" + - src: "{{ file_consul_agent_ca_pem }}" dest: "{{ consul_ca_file }}" + - src: "{{ file_consul_server_0_pem }}" + dest: "{{ consul_cert_file }}" + - src: "{{ file_consul_server_0_key_pem }}" + dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: false consul_datacenter: "yul1" +consul_node_role: "client" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "client" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.24" 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 4214df8a61..606fea1a73 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 @@ -55,12 +55,21 @@ nomad_servers: # Consul settings. nomad_use_consul: true consul_certificates: - - src: "{{ file_consul_ca_pem }}" + - src: "{{ file_consul_agent_ca_pem }}" dest: "{{ consul_ca_file }}" + - src: "{{ file_consul_server_0_pem }}" + dest: "{{ consul_cert_file }}" + - src: "{{ file_consul_server_0_key_pem }}" + dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: false consul_datacenter: "yul1" +consul_node_role: "client" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "client" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.24" 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 98c7acfb8a..645adf5ffc 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 @@ -55,12 +55,21 @@ nomad_servers: # Consul settings. nomad_use_consul: true consul_certificates: - - src: "{{ file_consul_ca_pem }}" + - src: "{{ file_consul_agent_ca_pem }}" dest: "{{ consul_ca_file }}" + - src: "{{ file_consul_server_0_pem }}" + dest: "{{ consul_cert_file }}" + - src: "{{ file_consul_server_0_key_pem }}" + dest: "{{ consul_key_file }}" +consul_verify_incoming: false +consul_verify_outgoing: false +consul_vefify_server_hostname: false +consul_allow_tls: false consul_datacenter: "yul1" +consul_node_role: "client" consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ ansible_hostname }}" -consul_node_role: "client" +consul_retry_join: true consul_retry_servers: - "10.30.51.23" - "10.30.51.24" -- cgit 1.2.3-korg