diff options
| author |   Emma Foley <efoley@redhat.com> | 2021-06-09 20:22:28 +0100 |
|---|---|---|
| committer | Emma Foley <efoley@redhat.com> | 2021-06-17 12:24:04 +0000 |
| commit | f47bd2019a95c665ace84a879b024a6c93aff031 (patch) | |
| tree | c86dcfc734849d8d18f064dc02c33155a5ac0c2f /docker/ansible/roles/run_collectd | |
| parent | 0b13b508203283a5f69f9c89217fb3cf4f6c1a1e (diff) | |
[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 <efoley@redhat.com>
Change-Id: Id5a8b8289c5e120eae7eb5bcf946c5d4dd9fdd48
Diffstat (limited to 'docker/ansible/roles/run_collectd')
| -rw-r--r-- | docker/ansible/roles/run_collectd/tasks/main.yml | 6 |
1 files changed, 3 insertions, 3 deletions
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 |