From 4ca8d421e290378bb671144cf38dadf39055b80a Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Tue, 30 Jul 2024 18:05:08 -0400
Subject: [PATCH] =?UTF-8?q?More=20shufflin=20=C2=AF\=5F(=E3=83=84)=5F/?=
 =?UTF-8?q?=C2=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bigboot_execute_resize.yml    | 37 ++++++++++++++---------------------
 bigboot_setup_environment.yml | 12 ++----------
 tasks/stop_docker_service.yml | 11 +++++++++++
 3 files changed, 28 insertions(+), 32 deletions(-)
 create mode 100644 tasks/stop_docker_service.yml

diff --git a/bigboot_execute_resize.yml b/bigboot_execute_resize.yml
index 4bfc6a1..72aaf36 100644
--- a/bigboot_execute_resize.yml
+++ b/bigboot_execute_resize.yml
@@ -14,20 +14,6 @@
         - (bigboot_data[inventory_hostname]['bigboot_execute_shrink_lv'] | default(false) | bool
             or bigboot_data[inventory_hostname]['bigboot_execute_bigboot'] | default(false) | bool)
       block:
-        - name: Check for and disable services exceeding the timeout threshold
-          ansible.builtin.import_tasks: tasks/check_systemd_services.yml
-
-        - name: Services disabled notice
-          ansible.builtin.debug:
-            msg: >-
-              The following services were disabled, and will be re-enabled post
-              Bigboot execution:
-
-              {{ bigboot_systemd_disabled_services | list | flatten }}
-          when:
-            - bigboot_systemd_disabled_services is defined
-            - bigboot_systemd_disabled_services | length > 0
-
         - name: Enable Grub filesystem check
           ansible.builtin.import_role:
             name: autofsck
@@ -48,6 +34,21 @@
         - name: Flush handlers
           ansible.builtin.meta: flush_handlers
 
+        - name: Check for and disable services exceeding the timeout threshold
+          ansible.builtin.import_tasks: tasks/check_systemd_services.yml
+
+        - name: Services disabled notice
+          ansible.builtin.debug:
+            msg: >-
+              The following services were disabled, and will be re-enabled post
+              Bigboot execution: {{ bigboot_systemd_disabled_services | join(',') }}
+          when:
+            - bigboot_systemd_disabled_services is defined
+            - bigboot_systemd_disabled_services | length > 0
+
+        - name: Stop Docker service if present and running
+          ansible.builtin.import_tasks: tasks/stop_docker_service.yml
+
 
     - name: Extend the timeout values for physical hosts
       ansible.builtin.set_fact:
@@ -83,11 +84,3 @@
       when:
         - bigboot_systemd_disabled_services is defined
         - bigboot_systemd_disabled_services | length > 0
-
-    - name: Restore Docker service to its previous running state
-      ansible.builtin.service:
-        name: docker.service
-        state: started
-      when:
-        - ansible_facts['services'][bigboot_docker_service] is defined
-        - ansible_facts['services'][bigboot_docker_service]['state'] == "running"
diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml
index 05d030b..5acc561 100644
--- a/bigboot_setup_environment.yml
+++ b/bigboot_setup_environment.yml
@@ -12,16 +12,8 @@
     - name: Cleanup from any previous executions
       ansible.builtin.import_tasks: tasks/cleanup.yml
 
-    - name: Ensure service facts are available
-      ansible.builtin.service_facts:
-
-    - name: Stop Docker service due to incompatibility
-      ansible.builtin.service:
-        name: "{{ bigboot_docker_service }}"
-        state: stopped
-      when:
-        - ansible_facts['services'][bigboot_docker_service] is defined
-        - ansible_facts['services'][bigboot_docker_service]['state'] == "running"
+    - name: Stop Docker service if present and running
+      ansible.builtin.import_tasks: tasks/stop_docker_service.yml
 
     - name: Set boot device details
       ansible.builtin.import_tasks: tasks/capture_boot_device_details.yml
diff --git a/tasks/stop_docker_service.yml b/tasks/stop_docker_service.yml
new file mode 100644
index 0000000..69fce68
--- /dev/null
+++ b/tasks/stop_docker_service.yml
@@ -0,0 +1,11 @@
+---
+- name: Ensure service facts are available
+  ansible.builtin.service_facts:
+
+- name: Stop Docker service due to incompatibility
+  ansible.builtin.service:
+    name: "{{ bigboot_docker_service }}"
+    state: stopped
+  when:
+    - ansible_facts['services'][bigboot_docker_service] is defined
+    - ansible_facts['services'][bigboot_docker_service]['state'] == "running"