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
---
 .../ansible/roles/config_files/tasks/network.yml   | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

(limited to 'docker/ansible/roles/config_files/tasks/network.yml')

diff --git a/docker/ansible/roles/config_files/tasks/network.yml b/docker/ansible/roles/config_files/tasks/network.yml
index 52902d4c..0af6a713 100644
--- a/docker/ansible/roles/config_files/tasks/network.yml
+++ b/docker/ansible/roles/config_files/tasks/network.yml
@@ -1,4 +1,4 @@
-#Copyright 2018 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.
@@ -14,26 +14,24 @@
 ---
 
 - name: Enable network plugin
-  template:
-    src: network.conf.j2
-    dest: "{{ config_file_dir }}/network.conf"
+  set_fact:
+    collectd_plugins: '{{ collectd_plugins | union (["network"]) | unique }}'
   tags:
      - network
 
 - name: Add network port if defined
-  lineinfile:
-    dest: "{{ config_file_dir }}/network.conf"
-    insertafter: Plugin network
-    line: "    Server \"{{ network_ip_addr }}\" \"{{ network_port }}\""
+  set_fact:
+    collectd_plugin_network_server: "{{ collectd_plugin_network_server | default([]) | union([{
+        'name': network_ip_addr,
+        'port': network_port,
+      }]) }}"
   when: network_ip_addr is defined
   tags:
    - network
 
 - name: Modify network.conf to add influxdb_hosts
-  lineinfile:
-    dest: "{{ config_file_dir }}/network.conf"
-    insertafter: Plugin network
-    line: "    Server \"{{ item }}\" \"{{ influx_network_port }}\""
+  set_fact:
+    collectd_plugin_network_server: "{{ collectd_plugin_network_server | default([]) | union([{ 'name': item, 'port': influx_network_port }]) }}"
   with_items: "{{ groups['influxdb_hosts'] }}"
   tags:
    - network
-- 
cgit 1.2.3-korg