Merge conflict

Revert "Merge "ansible: add ansible scripts to configure .conf file on collectd nodes""

This reverts commit 7effd9e1e84dd7fa2a189a0815b5be1c0fcb165a, reversing
changes made to b26034d05aa81f624e9bcee2c8e82a1cacfe44c4.

Change-Id: I6f77b4432bbe0de29db3e099263e461e3043b22e
Signed-off-by: TsaLaGi <aasmith@redhat.com>

16 files changed, 0 insertions, 753 deletions

diff --git a/docker/ansible/roles/config_files/templates/csv.conf.j2 b/docker/ansible/roles/config_files/templates/csv.conf.j2
deleted file mode 100644
index 3e351932..00000000
--- a/docker/ansible/roles/config_files/templates/csv.conf.j2
+++ /dev/null
@@ -1,21 +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 csv
-
-<Plugin csv>
-        DataDir "{{ csv_log_dir }}"
-        StoreRates false
-</Plugin>
-
diff --git a/docker/ansible/roles/config_files/templates/default_read_plugins.conf.j2 b/docker/ansible/roles/config_files/templates/default_read_plugins.conf.j2
deleted file mode 100644
index e0c52ca0..00000000
--- a/docker/ansible/roles/config_files/templates/default_read_plugins.conf.j2
+++ /dev/null
@@ -1,36 +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.
-
-Hostname "{{ inventory_hostname }}"
-Interval "{{ interval_value }}"
-
-
-#LoadPlugin contextswitch
-#LoadPlugin cpu
-#LoadPlugin cpufreq
-#LoadPlugin df
-#LoadPlugin disk
-#LoadPlugin ethstat
-#LoadPlugin ipc
-#LoadPlugin ipmi
-#LoadPlugin irq
-#LoadPlugin load
-#LoadPlugin memory
-#LoadPlugin numa
-#LoadPlugin processes
-#LoadPlugin swap
-#LoadPlugin turbostat
-#LoadPlugin uuid
-#LoadPlugin uptime
-
diff --git a/docker/ansible/roles/config_files/templates/exec.conf.j2 b/docker/ansible/roles/config_files/templates/exec.conf.j2
deleted file mode 100644
index 2467606b..00000000
--- a/docker/ansible/roles/config_files/templates/exec.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 exec
-
-<Plugin exec>
-     # For OVS PMD stats plugin
-     Exec "collectd_exec" "/src/barometer/src/collectd/collectd_sample_configs/ovs_pmd_stats.sh"
-     NotificationExec "collectd_exec" "/src/barometer/src/collectd/collectd_sample_configs/write_notification.sh"
-</Plugin>
-
diff --git a/docker/ansible/roles/config_files/templates/hugepages.conf.j2 b/docker/ansible/roles/config_files/templates/hugepages.conf.j2
deleted file mode 100644
index b391a398..00000000
--- a/docker/ansible/roles/config_files/templates/hugepages.conf.j2
+++ /dev/null
@@ -1,24 +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 hugepages
-
-<Plugin hugepages>
-    ReportPerNodeHP  true
-    ReportRootHP     true
-    ValuesPages      true
-    ValuesBytes      false
-    ValuesPercentage false
-</Plugin>
-
diff --git a/docker/ansible/roles/config_files/templates/intel_pmu.conf.j2 b/docker/ansible/roles/config_files/templates/intel_pmu.conf.j2
deleted file mode 100644
index 067a3e82..00000000
--- a/docker/ansible/roles/config_files/templates/intel_pmu.conf.j2
+++ /dev/null
@@ -1,24 +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_pmu
-
-<Plugin intel_pmu>
-  ReportHardwareCacheEvents true
-  ReportKernelPMUEvents true
-  ReportSoftwareEvents true
-#  EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json"
-#  HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
-</Plugin>
-
diff --git a/docker/ansible/roles/config_files/templates/kafka.conf.j2 b/docker/ansible/roles/config_files/templates/kafka.conf.j2
deleted file mode 100644
index 3e4bc242..00000000
--- a/docker/ansible/roles/config_files/templates/kafka.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 write_kafka
-
-<Plugin write_kafka>
-  Property "metadata.broker.list" "{{ kafka_ip_addr }}:{{ kafka_port }}"
-  <Topic "{{ kafka_topic }}">
-    Format JSON
-  </Topic>
-</Plugin>
diff --git a/docker/ansible/roles/config_files/templates/logfile.conf.j2 b/docker/ansible/roles/config_files/templates/logfile.conf.j2
deleted file mode 100644
index 8bc96ffe..00000000
--- a/docker/ansible/roles/config_files/templates/logfile.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 logfile
-
-<Plugin logfile>
-  LogLevel "{{ logfile_log_level }}"
-  File "{{ logfile_dir }}/collectd.log"
-  Timestamp true
-</Plugin>
-
diff --git a/docker/ansible/roles/config_files/templates/mcelog.conf.j2 b/docker/ansible/roles/config_files/templates/mcelog.conf.j2
deleted file mode 100644
index 148053cb..00000000
--- a/docker/ansible/roles/config_files/templates/mcelog.conf.j2
+++ /dev/null
@@ -1,26 +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 mcelog>
-  Interval 1
-</LoadPlugin>
-
-<Plugin mcelog>
-  <Memory>
-    McelogClientSocket "/var/run/mcelog-client"
-    PersistentNotification false
-  </Memory>
-##  McelogLogfile "/var/log/mcelog"
-</Plugin>
-
diff --git a/docker/ansible/roles/config_files/templates/network.conf.j2 b/docker/ansible/roles/config_files/templates/network.conf.j2
deleted file mode 100644
index 3d940e85..00000000
--- a/docker/ansible/roles/config_files/templates/network.conf.j2
+++ /dev/null
@@ -1,20 +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  network
-
-<Plugin network>
-    Server "{{ network_ip_addr }}" "{{ network_port }}"
-</Plugin>
-
diff --git a/docker/ansible/roles/config_files/templates/ovs_events.conf.j2 b/docker/ansible/roles/config_files/templates/ovs_events.conf.j2
deleted file mode 100644
index 4fbea5ad..00000000
--- a/docker/ansible/roles/config_files/templates/ovs_events.conf.j2
+++ /dev/null
@@ -1,26 +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 ovs_events>
-   Interval "{{ ovs_events_interval }}"
-</LoadPlugin>
-
-<Plugin ovs_events>
-#   Port "{{ ovs_event_port }}"
-#   Address "{{ ovs_event_ip_addr }}"
-#   Socket "/var/run/openvswitch/db.sock"
-#  Interfaces "br0" "veth0"
-   SendNotification true
-   DispatchValues true
-</Plugin>
diff --git a/docker/ansible/roles/config_files/templates/ovs_stats.conf.j2 b/docker/ansible/roles/config_files/templates/ovs_stats.conf.j2
deleted file mode 100644
index fc26e4b8..00000000
--- a/docker/ansible/roles/config_files/templates/ovs_stats.conf.j2
+++ /dev/null
@@ -1,25 +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 ovs_stats>
-   Interval "{{ ovs_stats_interval }}"
-</LoadPlugin>
-
-<Plugin ovs_stats>
-#   Port "{{ ovs_stats_port }}"
-#   Address "{{ ovs_stats_ip_addr }}"
-#   Socket "/var/run/openvswitch/db.sock"
-#   Bridges "br0" "br_ext"
-</Plugin>
-
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 814c23ca..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/rrdtool.conf.j2 b/docker/ansible/roles/config_files/templates/rrdtool.conf.j2
deleted file mode 100644
index dd874210..00000000
--- a/docker/ansible/roles/config_files/templates/rrdtool.conf.j2
+++ /dev/null
@@ -1,21 +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 rrdtool
-
-<Plugin rrdtool>
-  DataDir "{{ rrdtool_db_dir }}"
-  CacheFlush {{ cache_flush }}
-  WritesPerSecond {{ write_per_sec }}
-</Plugin>
diff --git a/docker/ansible/roles/config_files/templates/snmp_agent.conf.j2 b/docker/ansible/roles/config_files/templates/snmp_agent.conf.j2
deleted file mode 100644
index 406033ed..00000000
--- a/docker/ansible/roles/config_files/templates/snmp_agent.conf.j2
+++ /dev/null
@@ -1,389 +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 snmp_agent
-<Plugin snmp_agent>
-# Intel PMU MIB
-  <Table "pmuTable">
-    IndexOID "INTEL-PMU-MIB::pmuGroupIndex"
-    <Data "pmuGroupDescr">
-      Instance true
-      Plugin "intel_pmu"
-      OIDs "INTEL-PMU-MIB::pmuGroupDescr"
-    </Data>
-    <Data "pmuL1DCacheLoads">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "L1-dcache-loads"
-      OIDs "INTEL-PMU-MIB::pmuL1DCacheLoads"
-    </Data>
-    <Data "pmuL1DCacheLoadMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "L1-dcache-load-misses"
-      OIDs "INTEL-PMU-MIB::pmuL1DCacheLoadMisses"
-    </Data>
-    <Data "pmuL1DCacheStores">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "L1-dcache-stores"
-      OIDs "INTEL-PMU-MIB::pmuL1DCacheStores"
-    </Data>
-    <Data "pmuL1DCacheStoreMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "L1-dcache-store-misses"
-      OIDs "INTEL-PMU-MIB::pmuL1DCacheStoreMisses"
-    </Data>
-    <Data "pmuL1DCachePrefetches">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "L1-dcache-prefetches"
-      OIDs "INTEL-PMU-MIB::pmuL1DCachePrefetches"
-    </Data>
-    <Data "pmuL1DCachePrefetchMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "L1-dcache-prefetch-misses"
-      OIDs "INTEL-PMU-MIB::pmuL1DCachePrefetchMisses"
-    </Data>
-    <Data "pmuL1ICacheLoads">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "L1-icache-loads"
-      OIDs "INTEL-PMU-MIB::pmuL1ICacheLoads"
-    </Data>
-    <Data "pmuL1ICacheLoadMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "L1-icache-load-misses"
-      OIDs "INTEL-PMU-MIB::pmuL1ICacheLoadMisses"
-    </Data>
-    <Data "pmuL1ICachePrefetches">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "L1-icache-prefetches"
-      OIDs "INTEL-PMU-MIB::pmuL1ICachePrefetches"
-    </Data>
-    <Data "pmuL1ICachePrefetchMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "L1-icache-prefetch-misses"
-      OIDs "INTEL-PMU-MIB::pmuL1ICachePrefetchMisses"
-    </Data>
-    <Data "pmuLLCLoads">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "LLC-loads"
-      OIDs "INTEL-PMU-MIB::pmuLLCLoads"
-    </Data>
-    <Data "pmuLLCLoadMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "LLC-load-misses"
-      OIDs "INTEL-PMU-MIB::pmuLLCLoadMisses"
-    </Data>
-    <Data "pmuLLCStores">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "LLC-stores"
-      OIDs "INTEL-PMU-MIB::pmuLLCStores"
-    </Data>
-    <Data "pmuLLCStoreMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "LLC-store-misses"
-      OIDs "INTEL-PMU-MIB::pmuLLCStoreMisses"
-    </Data>
-    <Data "pmuLLCPrefetches">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "LLC-prefetches"
-      OIDs "INTEL-PMU-MIB::pmuLLCPrefetches"
-    </Data>
-    <Data "pmuLLCPrefetchMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "LLC-prefetch-misses"
-      OIDs "INTEL-PMU-MIB::pmuLLCPrefetchMisses"
-    </Data>
-    <Data "pmuDTLBLoads">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "dTLB-loads"
-      OIDs "INTEL-PMU-MIB::pmuDTLBLoads"
-    </Data>
-    <Data "pmuDTLBLoadMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "dTLB-load-misses"
-      OIDs "INTEL-PMU-MIB::pmuDTLBLoadMisses"
-    </Data>
-    <Data "pmuDTLBStores">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "dTLB-stores"
-      OIDs "INTEL-PMU-MIB::pmuDTLBStores"
-    </Data>
-    <Data "pmuDTLBStoreMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "dTLB-store-misses"
-      OIDs "INTEL-PMU-MIB::pmuDTLBStoreMisses"
-    </Data>
-    <Data "pmuDTLBPrefetches">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "dTLB-prefetches"
-      OIDs "INTEL-PMU-MIB::pmuDTLBPrefetches"
-    </Data>
-    <Data "pmuDTLBPrefetchMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "dTLB-prefetch-misses"
-      OIDs "INTEL-PMU-MIB::pmuDTLBPrefetchMisses"
-    </Data>
-    <Data "pmuITLBLoads">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "iTLB-loads"
-      OIDs "INTEL-PMU-MIB::pmuITLBLoads"
-    </Data>
-    <Data "pmuITLBLoadMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "iTLB-load-misses"
-      OIDs "INTEL-PMU-MIB::pmuITLBLoadMisses"
-    </Data>
-    <Data "pmuBranchLoads">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "branch-loads"
-      OIDs "INTEL-PMU-MIB::pmuBranchLoads"
-    </Data>
-    <Data "pmuBranchLoadMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "branch-load-misses"
-      OIDs "INTEL-PMU-MIB::pmuBranchLoadMisses"
-    </Data>
-    <Data "pmuCpuCycles">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "cpu-cycles"
-      OIDs "INTEL-PMU-MIB::pmuCpuCycles"
-    </Data>
-    <Data "pmuInstructions">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "instructions"
-      OIDs "INTEL-PMU-MIB::pmuInstructions"
-    </Data>
-    <Data "pmuCacheReferences">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "cache-references"
-      OIDs "INTEL-PMU-MIB::pmuCacheReferences"
-    </Data>
-    <Data "pmuCacheMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "cache-misses"
-      OIDs "INTEL-PMU-MIB::pmuCacheMisses"
-    </Data>
-    <Data "pmuBranches">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "branches"
-      OIDs "INTEL-PMU-MIB::pmuBranches"
-    </Data>
-    <Data "pmuBranchMisses">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "branch-misses"
-      OIDs "INTEL-PMU-MIB::pmuBranchMisses"
-    </Data>
-    <Data "pmuBusCycles">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "bus-cycles"
-      OIDs "INTEL-PMU-MIB::pmuBusCycles"
-    </Data>
-    <Data "pmuCpuClock">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "cpu-clock"
-      OIDs "INTEL-PMU-MIB::pmuCpuClock"
-    </Data>
-    <Data "pmuTaskClock">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "task-clock"
-      OIDs "INTEL-PMU-MIB::pmuTaskClock"
-    </Data>
-    <Data "pmuContextSwitches">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "context-switches"
-      OIDs "INTEL-PMU-MIB::pmuContextSwitches"
-    </Data>
-    <Data "pmuCpuMigrations">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "cpu-migrations"
-      OIDs "INTEL-PMU-MIB::pmuCpuMigrations"
-    </Data>
-    <Data "pmuPageFaults">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "page-faults"
-      OIDs "INTEL-PMU-MIB::pmuPageFaults"
-    </Data>
-    <Data "pmuMinorFaults">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "minor-faults"
-      OIDs "INTEL-PMU-MIB::pmuMinorFaults"
-    </Data>
-    <Data "pmuMajorFaults">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "major-faults"
-      OIDs "INTEL-PMU-MIB::pmuMajorFaults"
-    </Data>
-    <Data "pmuAlignmentFaults">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "alignment-faults"
-      OIDs "INTEL-PMU-MIB::pmuAlignmentFaults"
-    </Data>
-    <Data "pmuEmulationFaults">
-      Plugin "intel_pmu"
-      Type "counter"
-      TypeInstance "emulation-faults"
-      OIDs "INTEL-PMU-MIB::pmuEmulationFaults"
-    </Data>
-  </Table>
-# Intel RDT MIB
-  <Table "rdtTable">
-    IndexOID "INTEL-RDT-MIB::rdtGroupIndex"
-    SizeOID "INTEL-RDT-MIB::rdtGroupNumber"
-    <Data "rdtGroupDescr">
-      Instance true
-      Plugin "intel_rdt"
-      OIDs "INTEL-RDT-MIB::rdtGroupDescr"
-    </Data>
-    <Data "rdtLlc">
-      Plugin "intel_rdt"
-      Type "bytes"
-      TypeInstance "llc"
-      OIDs "INTEL-RDT-MIB::rdtLlc"
-    </Data>
-    <Data "rdtIpc">
-      Plugin "intel_rdt"
-      Type "ipc"
-      OIDs "INTEL-RDT-MIB::rdtIpc"
-    </Data>
-    <Data "rdtMbmRemote">
-      Plugin "intel_rdt"
-      Type "memory_bandwidth"
-      TypeInstance "remote"
-      OIDs "INTEL-RDT-MIB::rdtMbmRemote"
-    </Data>
-    <Data "rdtMbmLocal">
-      Plugin "intel_rdt"
-      Type "memory_bandwidth"
-      TypeInstance "local"
-      OIDs "INTEL-RDT-MIB::rdtMbmLocal"
-    </Data>
-  </Table>
-# Intel Mcelog MIB
-  <Table "mcelogTable">
-    IndexOID "INTEL-MCELOG-MIB::memoryGroupIndex"
-    <Data "memoryGroupDescr">
-      Instance true
-      Plugin "mcelog"
-      OIDs "INTEL-MCELOG-MIB::memoryGroupDescr"
-    </Data>
-    <Data "memoryCorrectedErrors">
-      Plugin "mcelog"
-      Type "errors"
-      TypeInstance "corrected_memory_errors"
-      OIDs "INTEL-MCELOG-MIB::memoryCorrectedErrors"
-    </Data>
-    <Data "memoryCorrectedTimedErrors">
-      Plugin "mcelog"
-      Type "errors"
-      TypeInstance "corrected_memory_errors_in_24h"
-      OIDs "INTEL-MCELOG-MIB::memoryCorrectedTimedErrors"
-    </Data>
-    <Data "memoryUncorrectedErrors">
-      Plugin "mcelog"
-      Type "errors"
-      TypeInstance "uncorrected_memory_errors"
-      OIDs "INTEL-MCELOG-MIB::memoryUncorrectedErrors"
-    </Data>
-    <Data "memoryUncorrectedTimedErrors">
-      Plugin "mcelog"
-      Type "errors"
-      TypeInstance "uncorrected_memory_errors_in_24h"
-      OIDs "INTEL-MCELOG-MIB::memoryUncorrectedTimedErrors"
-    </Data>
-  </Table>
-# Hugepages
-  <Table "hugepagesTable">
-    <Data "hugepagesNode">
-      Instance true
-      Plugin "hugepages"
-      OIDs "INTEL-HUGEPAGES-MIB::hugepagesNode"
-    </Data>
-    <Data "hugepagesMemoryFree">
-      Plugin "hugepages"
-      Type "memory"
-      TypeInstance "free"
-      OIDs "INTEL-HUGEPAGES-MIB::hugepagesMemoryFree"
-    </Data>
-    <Data "hugepagesMemoryUsed">
-      Plugin "hugepages"
-      Type "memory"
-      TypeInstance "used"
-      OIDs "INTEL-HUGEPAGES-MIB::hugepagesMemoryUsed"
-    </Data>
-    <Data "hugepagesPagesFree">
-      Plugin "hugepages"
-      Type "vmpage_number"
-      TypeInstance "free"
-      OIDs "INTEL-HUGEPAGES-MIB::hugepagesPagesFree"
-    </Data>
-    <Data "hugepagesPagesUsed">
-      Plugin "hugepages"
-      Type "vmpage_number"
-      TypeInstance "used"
-      OIDs "INTEL-HUGEPAGES-MIB::hugepagesPagesUsed"
-    </Data>
-    <Data "hugepagesPercentFree">
-      Plugin "hugepages"
-      Type "percent"
-      TypeInstance "free"
-      OIDs "INTEL-HUGEPAGES-MIB::hugepagesPercentFree"
-    </Data>
-    <Data "hugepagesPercentUsed">
-      Plugin "hugepages"
-      Type "percent"
-      TypeInstance "used"
-      OIDs "INTEL-HUGEPAGES-MIB::hugepagesPercentUsed"
-    </Data>
-  </Table>
-</Plugin>
-
diff --git a/docker/ansible/roles/config_files/templates/syslog.conf.j2 b/docker/ansible/roles/config_files/templates/syslog.conf.j2
deleted file mode 100644
index f9d77814..00000000
--- a/docker/ansible/roles/config_files/templates/syslog.conf.j2
+++ /dev/null
@@ -1,21 +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 syslog
-
-# Decrease syslog verbosity, to avoid duplicate logging
-<Plugin syslog>
-  LogLevel "{{ syslog_log_level }}"
-</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>
-