Merge "Add capabilities plugin (PR 3292 on collectd github) to experimental container. Update one-click install of experimental container to add capabilities plugin."

6 files changed, 70 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>
+
diff --git a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
index dcea33a3..ed337112 100755
--- a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
+++ b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
@@ -25,6 +25,7 @@
 
 PULL_REQUESTS=(
     3045 #logparser
+    3292 #capabilities plugin
     #insert another PR ID here
               )
 
diff --git a/docker/barometer-collectd-experimental/experimental-configs/capabilities.conf b/docker/barometer-collectd-experimental/experimental-configs/capabilities.conf
new file mode 100644
index 00000000..a422b702
--- /dev/null
+++ b/docker/barometer-collectd-experimental/experimental-configs/capabilities.conf
@@ -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>
+
diff --git a/systems/centos/7/build_base_machine.sh b/systems/centos/7/build_base_machine.sh
index 35e65e6d..eb098144 100755
--- a/systems/centos/7/build_base_machine.sh
+++ b/systems/centos/7/build_base_machine.sh
@@ -55,6 +55,8 @@ mcelog
 wget
 net-snmp-devel
 hiredis-devel
+libmicrohttpd-devel
+jansson-devel
 
 # install epel release required for git-review
 epel-release