diff options
| author |   Emma Foley <efoley@redhat.com> | 2019-12-12 10:49:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-12-12 10:49:17 +0000 |
| commit | 6afde5454ff335c1f1050905a6d171e76712cfd3 (patch) | |
| tree | d090fd6731afcd10c9b29ba00d3e8b69965fc856 /docker/ansible | |
| parent | f4017d53f1794571bbd0567e615aa96c3c2656f4 (diff) | |
| parent | c9411ce2494f6773470fd975adbfc7a30baec7d0 (diff) | |
Merge "Add capabilities plugin (PR 3292 on collectd github) to experimental container. Update one-click install of experimental container to add capabilities plugin."
Diffstat (limited to 'docker/ansible')
3 files changed, 47 insertions, 0 deletions
diff --git a/docker/ansible/roles/config_files/tasks/capabilities.yml b/docker/ansible/roles/config_files/tasks/capabilities.yml new file mode 100644 index 00000000..55672e83 --- /dev/null +++ b/docker/ansible/roles/config_files/tasks/capabilities.yml @@ -0,0 +1,24 @@ +#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. +--- + +- name: enable capabilities plugin + template: + src: experimental/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/tasks/main.yml b/docker/ansible/roles/config_files/tasks/main.yml index 58cfec63..aa12b7d7 100644 --- a/docker/ansible/roles/config_files/tasks/main.yml +++ b/docker/ansible/roles/config_files/tasks/main.yml @@ -29,6 +29,9 @@ tags: - always +- name: enable capabilities plugin + import_tasks: capabilities.yml + - name: enable csv plugin import_tasks: csv.yml diff --git a/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2 b/docker/ansible/roles/config_files/templates/experimental/capabilities.conf.j2 new file mode 100644 index 00000000..a422b702 --- /dev/null +++ b/docker/ansible/roles/config_files/templates/experimental/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 + +<Plugin capabilities> + Port "9564" +</Plugin> + |