[ansible] Use collectd_config for default_read_plugins

[barometer.git] / docker / ansible / roles / config_files / tasks / mcelog.yml

diff --git a/docker/ansible/roles/config_files/tasks/mcelog.yml b/docker/ansible/roles/config_files/tasks/mcelog.yml
index 794db98..ac14f80 100644 (file)
--- a/docker/ansible/roles/config_files/tasks/mcelog.yml
+++ b/docker/ansible/roles/config_files/tasks/mcelog.yml
@@ -1,16 +1,17 @@
-#Copyright 2018 OPNFV and Intel Corporation
+# Copyright 2018-2019 Intel Corporation and OPNFV. All rights reserved.
 #
 # 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
+# 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: install mcelog package
@@ -22,6 +23,20 @@
   tags:
      - mcelogs
 
+- name: check if mcelog present
+  shell: which mcelog > /dev/null
+  register: mcelog_present
+  ignore_errors: "true"
+  when: install_mcelog|default(false)|bool
+  tags:
+     - mcelogs
+
+- name: build mcelog from sources if not in package
+  import_tasks: make_mcelog.yml
+  when: (mcelog_present is failed) and (install_mcelog|default(false)|bool)
+  tags:
+     - mcelogs
+
 - name: start mcelog daemon if not running
   service:
      name: mcelog
@@ -58,6 +73,6 @@
   template:
     src: mcelog.conf.j2
     dest: "{{ config_file_dir }}/mcelog.conf"
-  when: mcelog_running|succeeded and mcelog_exists|succeeded and mcelog_client_exists|succeeded
+  when: (mcelog_running is succeeded) and (mcelog_exists is succeeded) and (mcelog_client_exists is succeeded)
   tags:
-    - mcelogs
+          - mcelogs