openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "bnr - Fix bad UEFI working" into stable/wallaby

This commit is contained in:
Zuul 2022-04-06 10:30:24 +00:00 committed by Gerrit Code Review
parent f134ae4dc4 aec3a9ec40
commit dad29f37eb
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tripleo_ansible/roles/backup_and_restore/defaults/main.yml
View File

@ -127,12 +127,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
# The name of the node to restore
tripleo_backup_and_restore_overcloud_restore_name: undercloud

19
tripleo_ansible/roles/backup_and_restore/tasks/run_backup.yml
View File

@ -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: Tasks in case historical backups are activated
block:
- name: Get date and time to add to the backup prefix