Merge "bnr - Fix bad UEFI working" into stable/victoria
This commit is contained in:
commit
8232697cd1
|
@ -113,12 +113,6 @@ tripleo_backup_and_restore_ceph_mon_role: "ceph_mon"
|
|||
# The cephadm path
|
||||
tripleo_backup_and_restore_cephadm_path: "/usr/sbin/cephadm"
|
||||
|
||||
# The partition (/dev/whatever) that contain the /boot and /boot/efi contents
|
||||
# but that are not mounted. These variables should only contain the last part
|
||||
# of the partition (the whatever), i.e: sda2, sda1, vda2, sdb3, sdc1...
|
||||
tripleo_backup_and_restore_boot_mount: replaceme
|
||||
tripleo_backup_and_restore_boot_efi_mount: replaceme
|
||||
|
||||
# Ceph cluster name
|
||||
tripleo_backup_and_restore_ceph_cluster: "ceph"
|
||||
tripleo_backup_and_restore_ceph_admin_keyring: "/etc/ceph/{{ tripleo_backup_and_restore_ceph_cluster }}.client.admin.keyring"
|
||||
|
|
|
@ -40,25 +40,6 @@
|
|||
tags:
|
||||
- bar_create_recover_image
|
||||
|
||||
- name: Check if /boot/efi is mounted when the OS uses UEFI
|
||||
set_fact:
|
||||
boot_efi_mount: "{{ ansible_facts['mounts'] | selectattr('mount', 'equalto', '/boot/efi') | list | length > 0 }}"
|
||||
when: efi_dir.stat.exists
|
||||
tags:
|
||||
- bar_create_recover_image
|
||||
|
||||
- name: Manually mount /boot/efi if it is not mounted
|
||||
shell: |
|
||||
set -o pipefail
|
||||
mkdir /boot/efi_stack
|
||||
mount /dev/{{ tripleo_backup_and_restore_boot_efi_mount }} /boot/efi_stack
|
||||
dd if=/dev/{{ tripleo_backup_and_restore_boot_mount }} of=/boot/{{ tripleo_backup_and_restore_boot_mount }}
|
||||
when:
|
||||
- efi_dir.stat.exists
|
||||
- not boot_efi_mount
|
||||
tags:
|
||||
- bar_create_recover_image
|
||||
|
||||
- name: Get date and time to add to the backup prefix
|
||||
command: "date +\"{{ tripleo_backup_and_restore_date_argument }}\""
|
||||
register: bar_timestamp
|
||||
|
|
Loading…
Reference in New Issue