aboutsummaryrefslogtreecommitdiffstats
path: root/docker/ansible/roles/config_files/templates
diff options
context:
space:
mode:
authorEmma Foley <efoley@redhat.com>2021-06-10 12:04:23 +0100
committerEmma Foley <efoley@redhat.com>2021-08-26 21:05:50 +0100
commit44d5d79394e29d783a7ef73ba742052d97fad124 (patch)
tree4b638f048fb97244e80d73df937ba266e1f339e8 /docker/ansible/roles/config_files/templates
parentdfb13929a9b878c0d41b88b53c62ff56fe8b6856 (diff)
[ansible] Use collectd_config for virt and rdt
Only one of virt and intel_rdt can be enabled at a time, and the existing checks are based on the existance of a {rdt,virt}.conf file to determine whether the other plugin is enabled. This check needed updating, and is now based on whether the other plugin is in the collectd_plugins value. Signed-off-by: Emma Foley <efoley@redhat.com> Change-Id: I175d60111bf133965e1ecbf3764cb12a25356576
Diffstat (limited to 'docker/ansible/roles/config_files/templates')
-rw-r--r--docker/ansible/roles/config_files/templates/rdt.conf.j222
-rw-r--r--docker/ansible/roles/config_files/templates/virt.conf.j232
2 files changed, 0 insertions, 54 deletions
diff --git a/docker/ansible/roles/config_files/templates/rdt.conf.j2 b/docker/ansible/roles/config_files/templates/rdt.conf.j2
deleted file mode 100644
index 0e1afcfc..00000000
--- a/docker/ansible/roles/config_files/templates/rdt.conf.j2
+++ /dev/null
@@ -1,22 +0,0 @@
-#Copyright 2018 OPNFV and Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-<LoadPlugin intel_rdt>
- Interval {{ rdt_interval }}
-</LoadPlugin>
-
-<Plugin intel_rdt>
- Cores ""
-</Plugin>
-
diff --git a/docker/ansible/roles/config_files/templates/virt.conf.j2 b/docker/ansible/roles/config_files/templates/virt.conf.j2
deleted file mode 100644
index f1ba324d..00000000
--- a/docker/ansible/roles/config_files/templates/virt.conf.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-#Copyright 2018 OPNFV and Intel Corporation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LoadPlugin virt
-
-<Plugin virt>
-# Connection "xen:///"
- RefreshInterval 60
-# Domain "name"
-# BlockDevice "name:device"
-# BlockDeviceFormat target
-# BlockDeviceFormatBasename false
-# InterfaceDevice "name:device"
-# IgnoreSelected false
-# HostnameFormat name
-# InterfaceFormat name
-# PluginInstanceFormat name
-# Instances 1
- ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
-</Plugin>
-