100 lines
2.9 KiB
Diff
100 lines
2.9 KiB
Diff
commit 6f8d7c964e2c95b37c68299e6077bc3f987faffb
|
|
Author: root <root@lu0530v6.wdf.sap.corp>
|
|
Date: Tue Jul 21 18:08:57 2020 +0200
|
|
|
|
solve issue #107 - Regenerate grub2 conf handler cannot be found when using Ansible 2.9.10
|
|
|
|
diff --git a/handlers/main.yml b/handlers/main.yml
|
|
index 3f59170..543d238 100644
|
|
--- a/handlers/main.yml
|
|
+++ b/handlers/main.yml
|
|
@@ -1,8 +1,49 @@
|
|
---
|
|
|
|
-- name: "Regenerate grub2 conf handler"
|
|
- import_tasks: tasks/RedHat/generic/regenerate-grub2-conf.yml
|
|
- when: sap_hana_preconfigure_run_grub2_mkconfig|d(true)
|
|
+- name: "Check if server is booted in BIOS or UEFI mode"
|
|
+ stat:
|
|
+ path: /sys/firmware/efi
|
|
+ get_checksum: no
|
|
+ register: efi_exists
|
|
+ listen: "Regenerate grub2 conf handler"
|
|
+ when:
|
|
+ - sap_hana_preconfigure_run_grub2_mkconfig|d(true)
|
|
+
|
|
+- debug:
|
|
+ var: efi_exists.stat.exists
|
|
+ listen: "Regenerate grub2 conf handler"
|
|
+ when:
|
|
+ - sap_hana_preconfigure_run_grub2_mkconfig|d(true)
|
|
+
|
|
+- name: "Run grub-mkconfig (BIOS mode)"
|
|
+ command: grub2-mkconfig -o /boot/grub2/grub.cfg
|
|
+ register: command_result
|
|
+ listen: "Regenerate grub2 conf handler"
|
|
+ when:
|
|
+ - not efi_exists.stat.exists
|
|
+ - sap_hana_preconfigure_run_grub2_mkconfig|d(true)
|
|
+
|
|
+- debug:
|
|
+ var: command_result.stdout_lines, command_result.stderr_lines
|
|
+ listen: "Regenerate grub2 conf handler"
|
|
+ when:
|
|
+ - not efi_exists.stat.exists
|
|
+ - sap_hana_preconfigure_run_grub2_mkconfig|d(true)
|
|
+
|
|
+- name: "Run grub-mkconfig (UEFI mode)"
|
|
+ command: grub2-mkconfig -o /boot/efi/EFI/redhat/grub.cfg
|
|
+ register: command_result
|
|
+ listen: "Regenerate grub2 conf handler"
|
|
+ when:
|
|
+ - efi_exists.stat.exists
|
|
+ - sap_hana_preconfigure_run_grub2_mkconfig|d(true)
|
|
+
|
|
+- debug:
|
|
+ var: command_result.stdout_lines, command_result.stderr_lines
|
|
+ listen: "Regenerate grub2 conf handler"
|
|
+ when:
|
|
+ - efi_exists.stat.exists
|
|
+ - sap_hana_preconfigure_run_grub2_mkconfig|d(true)
|
|
|
|
- name: "Reboot handler"
|
|
fail:
|
|
diff --git a/tasks/RedHat/generic/regenerate-grub2-conf.yml b/tasks/RedHat/generic/regenerate-grub2-conf.yml
|
|
deleted file mode 100644
|
|
index f369a66..0000000
|
|
--- a/tasks/RedHat/generic/regenerate-grub2-conf.yml
|
|
+++ /dev/null
|
|
@@ -1,30 +0,0 @@
|
|
----
|
|
-# tasks file for sap-hana-preconfigure/handlers/main.yml:
|
|
-
|
|
-- debug:
|
|
- msg: "Regerate grub2 config"
|
|
-
|
|
-- name: "Check if server is booted in BIOS or UEFI mode"
|
|
- stat:
|
|
- path: /sys/firmware/efi
|
|
- get_checksum: no
|
|
- register: efi_exists
|
|
-- debug:
|
|
- var: efi_exists.stat.exists
|
|
-
|
|
-- name: "Run grub-mkconfig (BIOS mode)"
|
|
- command: grub2-mkconfig -o /boot/grub2/grub.cfg
|
|
- register: command_result
|
|
- when:
|
|
- - not efi_exists.stat.exists
|
|
-- debug:
|
|
- var: command_result.stdout_lines, command_result.stderr_lines
|
|
-
|
|
-- name: "Run grub-mkconfig (UEFI mode)"
|
|
- command: grub2-mkconfig -o /boot/efi/EFI/redhat/grub.cfg
|
|
- register: command_result
|
|
- when:
|
|
- - efi_exists.stat.exists
|
|
-- debug:
|
|
- var: command_result.stdout_lines, command_result.stderr_lines
|
|
-
|