diff --git a/bigboot-noop.yml b/bigboot-noop.yml index ed9157b..2d9c80d 100644 --- a/bigboot-noop.yml +++ b/bigboot-noop.yml @@ -33,7 +33,7 @@ - name: Expand the logical volume to support /boot expansion ansible.builtin.debug: msg: - - "device: {{ bigboot_adjacent_lvm_device | trim }}" + - "device: {{ bigboot_adjacent_lvm_device }}" - "size : {{ bigboot_lv_shrink_size | int }}" when: - bigboot_execute_shrink_lv | bool diff --git a/bigboot.yml b/bigboot.yml index 5b6f12d..79e3085 100644 --- a/bigboot.yml +++ b/bigboot.yml @@ -35,7 +35,7 @@ name: infra.lvm_snapshots.shrink_lv vars: shrink_lv_devices: - - device: "{{ bigboot_adjacent_lvm_device | trim }}" + - device: "{{ bigboot_adjacent_lvm_device }}" size: "{{ bigboot_lv_shrink_size | int }}" when: - bigboot_execute_shrink_lv | bool diff --git a/tasks/capture_lv_device_details.yml b/tasks/capture_lv_device_details.yml index 11340cf..86a01ad 100644 --- a/tasks/capture_lv_device_details.yml +++ b/tasks/capture_lv_device_details.yml @@ -3,19 +3,19 @@ ansible.builtin.shell: cmd: | set -o pipefail - lsblk -p -o name,type | grep -vi swap | grep lvm | head -1 + lsblk -pl -o name,type,mountpoint | grep -vi swap | grep lvm | head -1 | awk '{ print $1}' executable: /bin/bash changed_when: false register: bigboot_adjacent_lvm - name: Set adjacent LVM device name ansible.builtin.set_fact: - bigboot_adjacent_lvm_device: "{{ bigboot_adjacent_lvm.stdout | regex_replace('.*(/dev.*)\\s+.*$', '\\1') }}" + bigboot_adjacent_lvm_device: "{{ bigboot_adjacent_lvm.stdout }}" - name: Get logical volume mount information ansible.builtin.set_fact: bigboot_lv_info: "{{ ansible_facts.mounts \ - | selectattr('device', 'equalto', bigboot_adjacent_lvm_device | trim) | first }}" + | selectattr('device', 'equalto', bigboot_adjacent_lvm_device) | first }}" - name: Assert that there is space on the logical volume for shrinkage ansible.builtin.assert: