Browse Source

Merge "[ffwd] Rework WA#1925078" into stable/train

changes/98/787698/1
Zuul 4 weeks ago
committed by Gerrit Code Review
parent
commit
cb9234db1e
1 changed files with 19 additions and 17 deletions
  1. +19
    -17
      deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml

+ 19
- 17
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml View File

@ -263,19 +263,6 @@ outputs:
- efi_dev.rc == 0
- efi_broken.rc == 0
block:
# WA: some versions of grub2 fail to look for grubenv in /boot/grub2/grubenv
# In this case we copy the file instead of creating simlink making sure if
# this is the case than grubenv is still available for previous bootrecord.
- name: Stat /boot/grub2/grubenv
stat:
path: /boot/grub2/grubenv
register: grubenv
- name: Copy /boot/grub2/grubenv to /boot/efi/EFI/redhat/grubenv
when: grubenv.stat.islnk is defined and grubenv.stat.islnk == False
copy:
src: /boot/grub2/grubenv
dest: /boot/efi/EFI/redhat/grubenv
remote_src: true
- name: Copy /boot/efi/EFI/redhat to /tmp
copy:
src: /boot/efi/EFI/redhat/
@ -417,13 +404,28 @@ outputs:
- step|int == 4
- upgrade_leapp_enabled
block:
- name: Reset boot order if WA#1925078 fired
shell: |
NEXT_BOOT="$(efibootmgr | grep BootOrder | awk -F'[ ,]*' '{print $2}')"
efibootmgr -n $NEXT_BOOT
- name: Reset boot order if WA#1925078 fired and fix grubenv
when:
- workaround_1925078_fired is defined
- workaround_1925078_fired|bool
block:
- name:
shell: |
NEXT_BOOT="$(efibootmgr -v | grep \\redhat | awk -F'[ t*]' '{print $2}')"
efibootmgr -n $NEXT_BOOT
# WA: some versions of grub2 fail to look for grubenv in /boot/grub2/grubenv
# In this case we copy the file instead of creating simlink making sure if
# this is the case than grubenv is still available for previous bootrecord.
- name: Stat /boot/grub2/grubenv
stat:
path: /boot/grub2/grubenv
register: grubenv
- name: Copy /boot/grub2/grubenv to /boot/efi/EFI/redhat/grubenv
when: grubenv.stat.islnk is defined and grubenv.stat.islnk == False
copy:
src: /boot/grub2/grubenv
dest: /boot/efi/EFI/redhat/grubenv
remote_src: true
- name: reboot to perform the upgrade
reboot:
reboot_timeout: "{{upgrade_leapp_reboot_timeout}}"


Loading…
Cancel
Save