From 1dbb2e51028914b1ea31fdfb60c668917f1d9893 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 20 Nov 2020 17:40:02 +0000 Subject: [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 --- .../roles/config_files/tasks/capabilities.yml | 3 +-- .../config_files/templates/capabilities.conf.j2 | 20 ++++++++++++++++++++ .../templates/experimental/capabilities.conf.j2 | 20 -------------------- 3 files changed, 21 insertions(+), 22 deletions(-) create mode 100644 docker/ansible/roles/config_files/templates/capabilities.conf.j2 delete mode 100644 docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2 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/capabilities.conf.j2 b/docker/ansible/roles/config_files/templates/capabilities.conf.j2 new file mode 100644 index 00000000..a422b702 --- /dev/null +++ b/docker/ansible/roles/config_files/templates/capabilities.conf.j2 @@ -0,0 +1,20 @@ +# Copyright 2019 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 capabilities + + + Port "9564" + + diff --git a/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2 b/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2 deleted file mode 100644 index a422b702..00000000 --- a/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2 +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 2019 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 capabilities - - - Port "9564" - - -- cgit 1.2.3-korg