aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorEmma Foley <efoley@redhat.com>2020-11-20 17:40:02 +0000
committerEmma Foley <efoley@redhat.com>2021-04-09 15:09:58 +0100
commit1dbb2e51028914b1ea31fdfb60c668917f1d9893 (patch)
tree9558d7bb42d9947177874a8933f3cbe9e321e233 /docker
parentfcb9b3f7f41c9d02e28be691ea4fea710f2bd9bb (diff)
[ansible][capabilities] Remove the capabilities template from experimental
Capabilities plugin was interoduced in collectd-5.11, which is part of the barometer-collectd container, so it can be included by default. Change-Id: Ia91d883907025ab8618b39147e14d47a4fc541c3 Signed-off-by: Emma Foley <efoley@redhat.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/ansible/roles/config_files/tasks/capabilities.yml3
-rw-r--r--docker/ansible/roles/config_files/templates/capabilities.conf.j2 (renamed from docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2)0
2 files changed, 1 insertions, 2 deletions
diff --git a/docker/ansible/roles/config_files/tasks/capabilities.yml b/docker/ansible/roles/config_files/tasks/capabilities.yml
index 55672e83..f57d55d7 100644
--- a/docker/ansible/roles/config_files/tasks/capabilities.yml
+++ b/docker/ansible/roles/config_files/tasks/capabilities.yml
@@ -15,9 +15,8 @@
- name: enable capabilities plugin
template:
- src: experimental/capabilities.conf.j2
+ src: capabilities.conf.j2
dest: "{{ config_file_dir }}/capabilities.conf"
- when: flavor|default('stable')|string == 'experimental'
tags:
- capabilities
diff --git a/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2 b/docker/ansible/roles/config_files/templates/capabilities.conf.j2
index a422b702..a422b702 100644
--- a/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2
+++ b/docker/ansible/roles/config_files/templates/capabilities.conf.j2