Merge pull request #4 from thane42/docker

Docker

README.md

@@ -128,8 +128,6 @@ These properties set in how and what package will be installed.
 * `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_agent_docker_image_version`: The version of the Docker Telegraf image to be used. Default the value contains the value given for `telegraf_agent_version`. Can be set to `latest` to get the actual `latest` tag for the provided Docker image.
-* `telegraf_uid_docker`: Override user id. Default: `995`
-* `telegraf_gid_docker`: Override group id. Default: `998`
 * `telegraf_agent_docker_registry`: Define a custom docker registry. Default: `""`
 * `telegraf_agent_docker_network`: attach to custom docker network. Default: `bridge`
 

defaults/main.yml

@@ -2,7 +2,7 @@
 telegraf_enabled: True
 # defaults file for ansible-telegraf
 
-telegraf_agent_version: 1.18.2
+telegraf_agent_version: 1.26.0
 telegraf_agent_version_patch: 1
 telegraf_agent_package: telegraf
 telegraf_agent_package_file_deb: telegraf_{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}_{{ telegraf_agent_package_arch }}.deb
@@ -22,8 +22,6 @@ telegraf_agent_config_path: /etc/telegraf
 telegraf_win_logfile_rotation_max_archives: 3
 
 # 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,16 +4,13 @@
   group:
     name: telegraf
     state: present
-    gid: "{{ telegraf_gid_docker }}"
 
 - name: Adding Telegraf user
   user:
     name: telegraf
     group: telegraf
     state: present
     create_home: False
-    home: "{{ telegraf_agent_config_path }}"
-    uid: "{{ telegraf_uid_docker }}"
     system: True
   become: yes
 
@@ -37,7 +34,7 @@
 
 - name: Ensure Telegraf Docker container is running
   docker_container:
-    user: "{{ telegraf_uid_docker }}:{{ telegraf_gid_docker }}"
+    user: "telegraf:telegraf"
     name: "{{ telegraf_agent_docker_name }}"
     image: "{{ telegraf_agent_docker_registry }}telegraf:{{ telegraf_agent_docker_image_version }}"
     state: started