From 1298d2b4e8cfeabc9dfe8a870af54921cbee99b2 Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Fri, 8 Mar 2024 14:42:44 -0500
Subject: [PATCH] refactored

---
 bigboot-noop.yml | 28 +++++++++++++---------------
 bigboot-op.yml   | 38 +++++++++++---------------------------
 2 files changed, 24 insertions(+), 42 deletions(-)

diff --git a/bigboot-noop.yml b/bigboot-noop.yml
index 345074e..9184d91 100644
--- a/bigboot-noop.yml
+++ b/bigboot-noop.yml
@@ -6,40 +6,38 @@
   strategy: free
 
   vars:
-    bigboot_size_target: 1G
+    bigboot_size_target: 2G
+
 
   tasks:
     - name: Capture boot device details
       ansible.builtin.import_tasks: tasks/capture_boot_device_details.yml
 
     - name: Shrink a logical volume for /boot expansion if needed
-      ansible.builtin.import_tasks: tasks/bigboot_manage_lv-noop.yml
+      ansible.builtin.import_tasks: tasks/capture_lv_device_details.yml
 
 
 - name: Import hi playbook
   ansible.builtin.import_playbook: rhc.rear.hi
+  when: bigboot_execute_bigboot | bool
 
 
-- name: Expand the /boot partition
+- name: Execute logical volume and boot parition resizing
   hosts: all
   become: true
   gather_facts: true
   strategy: free
 
   tasks:
-    - name: Do we have bigboot_size
+    - name: Execute Shrink_LV
       ansible.builtin.debug:
-        msg: "bigboot_size == {{ bigboot_size }}"
-
-    - name: Do we have bigboot_adjacent_lvm_device
-      ansible.builtin.debug:
-        msg: "bigboot_adjacent_lvm_device == {{ bigboot_adjacent_lvm_device }}"
-
-    - name: Execute Shrink_LV role to resize target logical volume
-      ansible.builtin.debug:
-        msg: "Would have included infra.lvm_snapshots.shrink_lv here."
+        msg:
+          - "device: {{ bigboot_adjacent_lvm_device | trim }}"
+          - "size  : {{ bigboot_lv_shrink_size | int }}"
       when: bigboot_execute_shrink_lv | bool
 
-    - name: Expand the /boot partition as requested
+    - name: Execute Bigboot as needed
       ansible.builtin.debug:
-        msg: "Would have included infra.lvm_snapshots.bigboot here."
+        msg: "{{ bigboot_size }}"
+      when: bigboot_execute_bigboot | bool
+
diff --git a/bigboot-op.yml b/bigboot-op.yml
index e032aea..7ce97e9 100644
--- a/bigboot-op.yml
+++ b/bigboot-op.yml
@@ -22,39 +22,23 @@
   when: bigboot_execute_bigboot | bool
 
 
-- name: Execute logical volume and boot parition resizing
+- name: Execute logical volume and boot parition resizing as needed
   hosts: all
   become: true
   gather_facts: true
   strategy: free
 
   tasks:
-    - name: Execute Shrink_LV
-      ansible.builtin.debug:
-        msg:
-          - "device: {{ bigboot_adjacent_lvm_device | trim }}"
-          - "size  : {{ bigboot_lv_shrink_size | int }}"
+    - name: Import Shrink_LV role to resize target logical volume
+      ansible.builtin.import_role:
+        name: infra.lvm_snapshots.shrink_lv
+      vars:
+        shrink_lv_devices:
+          - device: "{{ bigboot_adjacent_lvm_device | trim }}"
+            size: "{{ bigboot_lv_shrink_size | int }}"
       when: bigboot_execute_shrink_lv | bool
 
-    - name: Execute Bigboot as needed
-      ansible.builtin.debug:
-        msg: "{{ bigboot_size }}"
+    - name: Expand the /boot partition as requested
+      ansible.builtin.include_role:
+        name: infra.lvm_snapshots.bigboot
       when: bigboot_execute_bigboot | bool
-
-
-
-    # - name: Execute Shrink_LV/Bigboot as needed
-    #   when: bigboot_expansion_diff | int <= 0
-    #   block:
-    #   - name: Execute Shrink_LV role to resize target logical volume
-    #     ansible.builtin.import_role:
-    #       name: infra.lvm_snapshots.shrink_lv
-    #     vars:
-    #       shrink_lv_devices:
-    #         - device: "{{ bigboot_adjacent_lvm_device | trim }}"
-    #           size: "{{ bigboot_lv_shrink_size | int }}"
-    #     when: bigboot_execute_shrink_lv | bool
-
-    #   - name: Expand the /boot partition as requested
-    #     ansible.builtin.include_role:
-    #       name: infra.lvm_snapshots.bigboot