Infra: Backend infra upgrade

[csit.git] / fdio.infra.ansible / roles / consul / defaults / main.yaml

diff --git a/fdio.infra.ansible/roles/consul/defaults/main.yaml b/fdio.infra.ansible/roles/consul/defaults/main.yaml
index 786554e..b875c88 100644 (file)
--- a/fdio.infra.ansible/roles/consul/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/consul/defaults/main.yaml
@@ -3,14 +3,9 @@
 
 # Inst - Prerequisites.
 packages: "{{ packages_base + packages_by_distro[ansible_distribution | lower] + packages_by_arch[ansible_machine] }}"
-
 packages_base:
-  - "cgroup-bin"
   - "curl"
-  - "git"
-  - "libcgroup1"
   - "unzip"
-  - "htop"
 packages_by_distro:
   ubuntu:
     - []
@@ -20,7 +15,7 @@ packages_by_arch:
   x86_64:
     - []
 
-# Inst - Download Consul.
+# Inst - Consul Map.
 consul_architecture_map:
   amd64: "amd64"
   x86_64: "amd64"
@@ -29,7 +24,7 @@ consul_architecture_map:
   32-bit: "386"
   64-bit: "amd64"
 consul_architecture: "{{ consul_architecture_map[ansible_architecture] }}"
-consul_version: "1.8.6"
+consul_version: "1.9.5"
 consul_pkg: "consul_{{ consul_version }}_linux_{{ consul_architecture }}.zip"
 consul_zip_url: "https://releases.hashicorp.com/consul/{{ consul_version }}/{{ consul_pkg }}"
 
@@ -52,20 +47,17 @@ systemd_resolved_state: "stopped"
 # Conf - User and group.
 consul_group: "consul"
 consul_group_state: "present"
-consul_manage_group: true
-consul_manage_user: true
 consul_user: "consul"
-consul_user_groups: [ docker, nomad, consul, root ]
 consul_user_state: "present"
 
 # Conf - nomad.d/consul.hcl
 consul_nomad_integration: true
 consul_certificates:
-  - src: "{{ vault_consul_v1_ca_file }}"
+  - src: "{{ file_consul_ca_pem }}"
     dest: "{{ consul_ca_file }}"
-  - src: "{{ vault_consul_v1_cert_file }}"
+  - src: "{{ file_consul_server_0_pem }}"
     dest: "{{ consul_cert_file }}"
-  - src: "{{ vault_consul_v1_key_file }}"
+  - src: "{{ file_consul_server_0_key_pem }}"
     dest: "{{ consul_key_file }}"
 
 consul_auto_advertise: true
@@ -92,7 +84,8 @@ consul_encrypt: ""
 consul_ca_file: "{{ consul_ssl_dir }}/ca.pem"
 consul_cert_file: "{{ consul_ssl_dir }}/consul.pem"
 consul_key_file: "{{ consul_ssl_dir }}/consul-key.pem"
-consul_ui: true
+consul_ui_config:
+  enabled: true
 consul_recursors:
   - 1.1.1.1
   - 8.8.8.8
@@ -107,4 +100,4 @@ consul_port_serf_wan: 8302
 consul_port_server: 8300
 
 # Conf - services.json
-consul_services: false
\ No newline at end of file
+consul_services: false