From dfb13929a9b878c0d41b88b53c62ff56fe8b6856 Mon Sep 17 00:00:00 2001
From: Emma Foley <efoley@redhat.com>
Date: Wed, 9 Jun 2021 18:36:17 +0100
Subject: [ansible] Use collectd_config for plugins

* Update the following plugins to use collectd_config role
  * capabilities
  * csv
  * dpdk_telemetry
  * exec
  * hugepages
  * ipmi
  * logfile
  * network
  * ovs_events
  * ovs_stats
  * syslog
  * uuid
  * write_kafka
  * write_prometheus

JIRA: BAROMETER-180
Signed-off-by: Emma Foley <efoley@redhat.com>
Change-Id: I2ec9e3c2db2c1d907459b40550012834196f0c65
---
 docker/ansible/roles/config_files/tasks/main.yml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

(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 4a25e4eb..eab356d9 100644
--- a/docker/ansible/roles/config_files/tasks/main.yml
+++ b/docker/ansible/roles/config_files/tasks/main.yml
@@ -83,6 +83,9 @@
 - name: enable syslog plugin
   import_tasks: syslog.yml
 
+- name: enable ovs plugins
+  import_tasks: ovs.yml
+
 - name: enable virt plugin
   import_tasks: virt.yml
 
@@ -101,13 +104,23 @@
     - 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
+- name: Copy the generated plugin configs
+  copy:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  with_items:
+    - { src: "/tmp/collectd.conf.d/", dest: "{{ config_file_dir }}" }
+    - { src: "/tmp/collectd.conf", dest: "{{ config_file_dir }}/../collectd.conf" }
   tags:
     - always
     - en_default_all
 
+- name: Update TypesDB location
+  lineinfile:
+    path: "{{ config_file_dir }}../collectd.conf"
+    regexp: '^TypesDB "/usr/share/collectd/types.db"$'
+    line: 'TypesDB "/opt/collectd/share/collectd/types.db"'
+
 - name: Update config file location
   lineinfile:
     path: "{{ config_file_dir }}../collectd.conf"
-- 
cgit 1.2.3-korg