From f47bd2019a95c665ace84a879b024a6c93aff031 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 9 Jun 2021 20:22:28 +0100 Subject: [ansible] Use collectd_config in config_files role * Add tasks to use collectd_config * Move generated configs to combine with existing and additional configs * Move vars to defaults dir Some of the vars are needed for the collectd_config role, and need to be set before the other values are set. JIRA: BAROMETER-180 Signed-off-by: Emma Foley Change-Id: Id5a8b8289c5e120eae7eb5bcf946c5d4dd9fdd48 --- docker/ansible/roles/run_collectd/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docker/ansible/roles/run_collectd/tasks') diff --git a/docker/ansible/roles/run_collectd/tasks/main.yml b/docker/ansible/roles/run_collectd/tasks/main.yml index 8fc27342..2c5d0e67 100644 --- a/docker/ansible/roles/run_collectd/tasks/main.yml +++ b/docker/ansible/roles/run_collectd/tasks/main.yml @@ -1,4 +1,4 @@ -#Copyright 2018-2019 OPNFV and Intel Corporation +# Copyright 2018-21 Anuket, Intel Corporation and others # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ set_fact: volumes_list: - - /opt/collectd/etc/collectd.conf.d/:/opt/collectd/etc/collectd.conf.d + - /opt/collectd/etc/:/opt/collectd/etc/ - /var/run:/var/run - /tmp:/tmp - /var/lib/collectd:/var/lib/collectd @@ -55,7 +55,7 @@ name: bar-collectd image: "{{ collectd_image_name }}" volumes: "{{ volumes_list }}" - command: "/run_collectd.sh" + entrypoint: "/run_collectd.sh" detach: yes state: started restart: yes -- cgit 1.2.3-korg