Merge "WIP: Add role to auto install docker on hosts"

4 files changed, 49 insertions, 17 deletions

diff --git a/docker/ansible/roles/config_files/tasks/ipmi.yml b/docker/ansible/roles/config_files/tasks/ipmi.yml
index 5ea62c47..c7359fbf 100644
--- a/docker/ansible/roles/config_files/tasks/ipmi.yml
+++ b/docker/ansible/roles/config_files/tasks/ipmi.yml
@@ -13,14 +13,6 @@
 # limitations under the License.
 ---
 
-- name: Check if /dev/ipmi0 exists
-  stat:
-    path: /dev/ipmi0
-  register: ipmi0_exists
-  ignore_errors: True
-  tags:
-    - ipmi
-
 - name: check ipmi_devintf is loaded
   shell: "lsmod | cut -d' ' -f1 | grep ipmi_devintf"
   register: ipmi_devintf
@@ -35,6 +27,30 @@
   tags:
     - ipmi
 
+- name: insert ipmi module ipmi_devintf
+  command: "modprobe ipmi_devintf"
+  register: ipmi_devintf
+  ignore_errors: true
+  when: ipmi_devintf|failed and insert_ipmi_modules|default(false)|bool
+  tags:
+     - ipmi
+
+- name: insert ipmi module ipmi_si
+  command: "modprobe ipmi_si"
+  register: ipmi_devsi
+  ignore_errors: true
+  when: ipmi_devsi|failed and insert_ipmi_modules|default(false)|bool
+  tags:
+     - ipmi
+
+- name: Check if /dev/ipmi0 exists
+  stat:
+    path: /dev/ipmi0
+  register: ipmi0_exists
+  ignore_errors: true
+  tags:
+     - ipmi
+
 - name: enable ipmi plugin
   template:
     src: ipmi.conf.j2
diff --git a/docker/ansible/roles/config_files/tasks/main.yml b/docker/ansible/roles/config_files/tasks/main.yml
index 9a9cb300..4bf81f81 100644
--- a/docker/ansible/roles/config_files/tasks/main.yml
+++ b/docker/ansible/roles/config_files/tasks/main.yml
@@ -74,8 +74,8 @@
 - name: enable ipmi plugin
   include: ipmi.yml
 
+- name: enable uuid plugin
+  include: uuid.yml
+
 - name: copy additional config files
   include: additional_configs.yml
-
-- name: copy types.db to target
-  include: types_db.yml
diff --git a/docker/ansible/roles/config_files/tasks/mcelog.yml b/docker/ansible/roles/config_files/tasks/mcelog.yml
index 9c935e3e..bab4b142 100644
--- a/docker/ansible/roles/config_files/tasks/mcelog.yml
+++ b/docker/ansible/roles/config_files/tasks/mcelog.yml
@@ -13,6 +13,23 @@
 # limitations under the License.
 ---
 
+- name: install mcelog package
+  package:
+     name: mcelog
+     state: present
+  when: install_mcelog|default(false)|bool
+  tags:
+     - mcelogs
+
+- name: start mcelog daemon if not running
+  service:
+     name: mcelog
+     state: started
+     enabled: true
+  when: install_mcelog|default(false)|bool
+  tags:
+     - mcelogs
+
 - name: check if mcelog running on host
   shell: ps -ef | grep mcelog | grep -v grep > /dev/null
   register: mcelog_running
diff --git a/docker/ansible/roles/config_files/tasks/types_db.yml b/docker/ansible/roles/config_files/tasks/uuid.yml
index 7603bdcf..25cfa128 100644
--- a/docker/ansible/roles/config_files/tasks/types_db.yml
+++ b/docker/ansible/roles/config_files/tasks/uuid.yml
@@ -13,10 +13,9 @@
 # limitations under the License.
 ---
 
-- name: copy types.db to target system
-  copy:
-    src: types.db
-    dest: "{{ typesdb_dir }}/types.db"
-  ignore_errors: True
+- name: enable uuid plugin
+  template:
+    src: uuid.conf.j2
+    dest: "{{ config_file_dir }}/uuid.conf"
   tags:
-     - typesdb
+    - uuid