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/config_files/tasks/main.yml | 29 +++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'docker/ansible/roles/config_files/tasks/main.yml') diff --git a/docker/ansible/roles/config_files/tasks/main.yml b/docker/ansible/roles/config_files/tasks/main.yml index b3e93765..4a25e4eb 100644 --- a/docker/ansible/roles/config_files/tasks/main.yml +++ b/docker/ansible/roles/config_files/tasks/main.yml @@ -1,4 +1,5 @@ -# Copyright 2018-2019 Intel Corporation and OPNFV. All rights reserved. +# Copyright 2018-2021 Intel Corporation, Anuket and others. +# All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -91,5 +92,31 @@ - name: enable uuid plugin include: uuid.yml +- name: configure plugins + include_role: + name: collectd_config + vars: + collectd_conf_output_dir: /tmp/collectd.conf.d + tags: + - always + - en_default_all + +- name: "Copy the generated plugin configs" + shell: + sudo cp /tmp/collectd.conf.d/*.conf {{ config_file_dir }} && sudo cp /tmp/collectd.conf {{ config_file_dir }}/../collectd.conf + tags: + - always + - en_default_all + +- name: Update config file location + lineinfile: + path: "{{ config_file_dir }}../collectd.conf" + regexp: "^(.*)/tmp/collectd.conf.d(.*)$" + line: '\1{{ config_file_dir }}\2' + backrefs: yes + tags: + - always + - en_default_all + - name: copy additional config files include: additional_configs.yml -- cgit 1.2.3-korg