X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=fdio.infra.ansible%2Froles%2Fconsul%2Ftasks%2Fmain.yaml;h=834d7f1798f15b5cd6261ba4418c3f0dedfd0c17;hp=99ac52da4430a7f6c3079ff46dffee84bf5742f0;hb=78a8427cc50c137e5d59ad3448ae128fdda369b2;hpb=6c70887b91dd02d5c7bba0df61c2503db97abc6d

diff --git a/fdio.infra.ansible/roles/consul/tasks/main.yaml b/fdio.infra.ansible/roles/consul/tasks/main.yaml
index 99ac52da44..834d7f1798 100644
--- a/fdio.infra.ansible/roles/consul/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/consul/tasks/main.yaml
@@ -3,7 +3,7 @@
 
 - name: Inst - Update Package Cache (APT)
   apt:
-    update_cache: yes
+    update_cache: true
     cache_valid_time: 3600
   when:
     - ansible_distribution|lower == 'ubuntu'
@@ -21,8 +21,6 @@
   group:
     name: "{{ consul_group }}"
     state: "{{ consul_group_state }}"
-  when:
-    - consul_manage_group | bool
   tags:
     - consul-conf-user
 
@@ -30,11 +28,8 @@
   user:
     name: "{{ consul_user }}"
     group: "{{ consul_group }}"
-    groups: "{{ consul_user_groups }}"
     state: "{{ consul_user_state }}"
     system: true
-  when:
-    - consul_manage_user | bool
   tags:
     - consul-conf-user
 
@@ -167,6 +162,15 @@
   tags:
     - consul-conf
 
+- name: Conf - Stop Systemd-resolved
+  systemd:
+    daemon_reload: true
+    enabled: false
+    name: "systemd-resolved"
+    state: "{{ systemd_resolved_state }}"
+  tags:
+    - consul-conf
+
 - name: Conf - System.d Script
   template:
     src: "consul_systemd.service.j2"
@@ -174,9 +178,10 @@
     owner: "root"
     group: "root"
     mode: 0644
-#  notify:
-#    - "Restart Consul"
-#    - "Stop Systemd-resolved"
-#    - "Restart Nomad"
+  notify:
+    - "Restart Consul"
+    - "Restart Nomad"
   tags:
     - consul-conf
+
+- meta: flush_handlers