remove restarts, add force restart path, move charon

Author: anandkumarpatel

ansible/docks.yml

@@ -1,5 +1,4 @@
 ---
-- hosts: charon
 - hosts: redis
 - hosts: redis-slave
 - hosts: neo4j
@@ -11,8 +10,10 @@
   roles:
     - { role: docker, tags: "docker" }
     - { role: iptables, tags: "iptables, security" }
+    - { role: datadog }
 
 - include: krain.yml
 - include: filibuster.yml
 - include: sauron.yml
 - include: image-builder.yml
+- include: charon.yml

ansible/roles/datadog/tasks/main.yml

@@ -5,7 +5,6 @@
   apt:
     name=apt-transport-https
     state=latest
-  notify: restart datadog-agent
 
 - name: add datadog apt key
   tags: ['datadog']
@@ -14,7 +13,6 @@
     id=C7A7DA52
     keyserver=keyserver.ubuntu.com
     state=present
-  notify: restart datadog-agent
 
 - name: add datadog repository
   tags: ['datadog']
@@ -23,7 +21,6 @@
     repo='deb http://apt.datadoghq.com/ stable main'
     state=present
     update_cache=yes
-  notify: restart datadog-agent
 
 - name: Create main Datadog agent configuration file
   tags: ['datadog']
@@ -41,3 +38,9 @@
     src=tcp_check.yaml.j2
     dest=/etc/dd-agent/conf.d/tcp_check.yaml
   notify: restart datadog-agent
+
+- name: force notify
+  tags: ['datadogg']
+  command: echo restart datadog
+  when: force_restart is defined
+  notify: restart datadog-agent