Merge conflict 69/52769/1
authorTsaLaGi <aasmith@redhat.com>
Tue, 27 Feb 2018 14:17:38 +0000 (09:17 -0500)
committerTsaLaGi <aasmith@redhat.com>
Tue, 27 Feb 2018 15:35:11 +0000 (10:35 -0500)
commit7f4ef61d68c3ed96759f3553b2793e0ce6a7e4a5
tree0f70462600336e92217628496da2ac8d09a3134c
parent7effd9e1e84dd7fa2a189a0815b5be1c0fcb165a
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>
35 files changed:
docker/ansible/ansible.cfg [deleted file]
docker/ansible/roles/config_files/tasks/csv.yml [deleted file]
docker/ansible/roles/config_files/tasks/default_read_import.yml [deleted file]
docker/ansible/roles/config_files/tasks/default_read_plugins.yml [deleted file]
docker/ansible/roles/config_files/tasks/exec.yml [deleted file]
docker/ansible/roles/config_files/tasks/hugepages.yml [deleted file]
docker/ansible/roles/config_files/tasks/kafka.yml [deleted file]
docker/ansible/roles/config_files/tasks/logfile.yml [deleted file]
docker/ansible/roles/config_files/tasks/main.yml [deleted file]
docker/ansible/roles/config_files/tasks/mcelog.yml [deleted file]
docker/ansible/roles/config_files/tasks/network.yml [deleted file]
docker/ansible/roles/config_files/tasks/pmu.yml [deleted file]
docker/ansible/roles/config_files/tasks/rdt.yml [deleted file]
docker/ansible/roles/config_files/tasks/rrdtool.yml [deleted file]
docker/ansible/roles/config_files/tasks/snmp_agent.yml [deleted file]
docker/ansible/roles/config_files/tasks/syslog.yml [deleted file]
docker/ansible/roles/config_files/tasks/virt.yml [deleted file]
docker/ansible/roles/config_files/tasks/vswitch.yml [deleted file]
docker/ansible/roles/config_files/templates/csv.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/default_read_plugins.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/exec.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/hugepages.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/intel_pmu.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/kafka.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/logfile.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/mcelog.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/network.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/ovs_events.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/ovs_stats.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/rdt.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/rrdtool.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/snmp_agent.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/syslog.conf.j2 [deleted file]
docker/ansible/roles/config_files/templates/virt.conf.j2 [deleted file]
docker/ansible/roles/config_files/vars/main.yml [deleted file]