diff options
Diffstat (limited to 'fdio.infra.ansible/roles/consul')
| -rw-r--r-- | fdio.infra.ansible/roles/consul/defaults/main.yaml | 2 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/consul/tasks/main.yaml | 38 |
2 files changed, 22 insertions, 18 deletions
diff --git a/fdio.infra.ansible/roles/consul/defaults/main.yaml b/fdio.infra.ansible/roles/consul/defaults/main.yaml index 1bb72f1a15..3905d05e0a 100644 --- a/fdio.infra.ansible/roles/consul/defaults/main.yaml +++ b/fdio.infra.ansible/roles/consul/defaults/main.yaml @@ -27,6 +27,7 @@ consul_architecture: "{{ consul_architecture_map[ansible_architecture] }}" 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 }}" +consul_force_update: false # Inst - System paths. consul_bin_dir: "/usr/local/bin" @@ -42,6 +43,7 @@ consul_node_role: "both" consul_restart_handler_state: "restarted" nomad_restart_handler_state: "restarted" systemd_resolved_state: "stopped" +consul_service_mgr: "" # Conf - User and group. consul_group: "consul" diff --git a/fdio.infra.ansible/roles/consul/tasks/main.yaml b/fdio.infra.ansible/roles/consul/tasks/main.yaml index f4e08259da..4e229714b7 100644 --- a/fdio.infra.ansible/roles/consul/tasks/main.yaml +++ b/fdio.infra.ansible/roles/consul/tasks/main.yaml @@ -1,21 +1,16 @@ --- # file: roles/consul/tasks/main.yaml -- name: Inst - Update Package Cache (APT) +- name: Install Dependencies apt: - update_cache: true + name: "{{ packages | flatten(levels=1) }}" + state: "present" cache_valid_time: 3600 + install_recommends: false when: - ansible_distribution|lower == 'ubuntu' tags: - - consul-inst-prerequisites - -- name: Inst - Prerequisites - package: - name: "{{ packages | flatten(levels=1) }}" - state: latest - tags: - - consul-inst-prerequisites + - consul-inst-dependencies - name: Conf - Add Consul Group group: @@ -33,13 +28,6 @@ tags: - consul-conf-user -- name: Inst - Clean Consul - file: - path: "{{ consul_inst_dir }}/consul" - state: "absent" - tags: - - consul-inst-package - - name: Inst - Download Consul get_url: url: "{{ consul_zip_url }}" @@ -47,11 +35,19 @@ tags: - consul-inst-package +- name: Inst - Clean Consul + file: + path: "{{ consul_inst_dir }}/consul" + state: "absent" + when: + - consul_force_update | bool + tags: + - consul-inst-package + - name: Inst - Unarchive Consul unarchive: src: "{{ consul_inst_dir }}/{{ consul_pkg }}" dest: "{{ consul_inst_dir }}/" - creates: "{{ consul_inst_dir }}/consul" remote_src: true tags: - consul-inst-package @@ -147,6 +143,8 @@ mode: 0600 no_log: true loop: "{{ consul_certificates | flatten(levels=1) }}" + when: + - consul_certificates is defined tags: - consul-conf @@ -156,6 +154,8 @@ enabled: false name: "systemd-resolved" state: "{{ systemd_resolved_state }}" + when: + - nomad_service_mgr == "systemd" tags: - consul-conf @@ -169,6 +169,8 @@ notify: - "Restart Consul" - "Restart Nomad" + when: + - nomad_service_mgr == "systemd" tags: - consul-conf |