Merge pull request #88 from jgeusebroek/master

Docker enhancements

README.md

@@ -76,6 +76,8 @@ Docker specific role variables:
 * `telegraf_agent_docker_name`: Name of the docker container. Default: `telegraf`
 * `telegraf_agent_docker_network_mode`: Networking mode of the docker container. Default: `bridge`
 * `telegraf_agent_docker_restart_policy`: Docker container restart policy. Default: `unless-stopped`
+* `telegraf_uid_docker`: Override user id. Default: `995`
+* `telegraf_gid_docker`: Override group id. Default: `998`
 
 Full agent settings reference: [https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#agent-configuration](https://github.com/influxdata/telegraf/blob/master/docs/CONFIGURATION.md#agent-configuration).
 

defaults/main.yml

@@ -15,6 +15,8 @@ telegraf_agent_aws_tags: False
 telegraf_agent_aws_tags_prefix: ""
 
 # Docker specific settings
+telegraf_uid_docker: 998
+telegraf_gid_docker: 995
 telegraf_agent_docker: False
 telegraf_agent_docker_name: telegraf
 telegraf_agent_docker_network_mode: bridge

tasks/docker.yml

@@ -4,7 +4,7 @@
   group:
     name: telegraf
     state: present
-    gid: 995
+    gid: "{{ telegraf_gid_docker }}"
 
 - name: Adding Telegraf user
   user:
@@ -13,7 +13,7 @@
     state: present
     create_home: False
     home: /etc/telegraf
-    uid: 998
+    uid: "{{ telegraf_uid_docker }}"
     system: True
   become: yes
 
@@ -43,6 +43,8 @@
     restart_policy: "{{ telegraf_agent_docker_restart_policy }}"
     command: -config /etc/telegraf/telegraf.conf -config-directory /etc/telegraf/telegraf.d
     network_mode: "{{ telegraf_agent_docker_network_mode }}"
+    security_opts:
+      - apparmor:unconfined
     volumes:
       - /etc/telegraf:/etc/telegraf:ro
       - /:/hostfs:ro