minor fixes (entrypoint) and restructuring

roles/cobald/tasks/telegraf.yml

@@ -20,7 +20,8 @@
     owner: "{{unpriv_user}}"
     group: docker
 
-- docker_image:
+- name: docker image for telegraf
+  docker_image:
     name: "ed-telegraf"
     build:
       pull: False
@@ -28,25 +29,32 @@
     source: build
     force_source: "{{cobald_cp_telegraf_dockerfile.changed}}"
 
-- block:
-  - import_tasks: influxdb.yml
-    tags: influxdb
-
-  - template:
-      src: telegraf.conf.j2
-      dest: /container/volumes/telegraf/telegraf.conf
-      owner: "{{unpriv_user}}"
-      group: docker
-    vars:
-      # influx_url: "http://{{influx_hostname}}.{{influx_domainname}}:8086"
-      influx_url: "http://{{influx_hostname}}:8086"
-      influx_token: "{{influx_telegraf_token.token}}"
-  vars:
+- set_fact:
     influx_hostname: "ed-influxdb"
     influx_domainname: "cobald.local"
     influx_bucket: batleth
+  tags: influxdb
 
-- docker_container:
+- import_tasks: influxdb.yml
+  tags: influxdb
+
+- set_fact:
+    # influx_url: "http://{{influx_hostname}}.{{influx_domainname}}:8086"
+    influx_url: "http://{{influx_hostname}}:8086"
+  tags: influxdb
+
+- name: generate telegraf config
+  template:
+    src: telegraf.conf.j2
+    dest: /container/volumes/telegraf/telegraf.conf
+    owner: "{{unpriv_user}}"
+    group: docker
+  vars:
+    influx_token: "{{influx_telegraf_token.token}}"
+  register: telegraf_config_gen
+
+- name: run telegraf container
+  docker_container:
     name: ed-telegraf
     image: ed-telegraf
     hostname: telegraf
@@ -56,6 +64,7 @@
     volumes:
     - "/container/volumes/telegraf/telegraf.conf:/etc/telegraf/telegraf.conf:ro"
     state: started
+    recreate: "{{ telegraf_config_gen.changed | default(False) | bool }}"
     detach: True
 #   cleanup: True
     networks_cli_compatible: True