From 6a0b9ff2ba633099f5cf54db79112131b949991a Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Tue, 23 Jul 2024 23:21:29 -0400 Subject: [PATCH] fix docker service management --- bigboot_setup_environment.yml | 19 ++++++++++++------- vars/bigboot_vars.yml | 2 ++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml index 87eb302..16968cf 100644 --- a/bigboot_setup_environment.yml +++ b/bigboot_setup_environment.yml @@ -15,13 +15,13 @@ - name: Get the list of services on the host ansible.builtin.service_facts: - - name: Disable Docker service due to incompatibility + - name: Stop Docker service due to incompatibility ansible.builtin.service: name: docker.service state: stopped - enabled: false when: - - "'docker.service' in ansible_facts['services']" + - ansible_facts['services'][bigboot_docker_service] is defined + - ansible_facts['services'][bigboot_docker_service]['state'] == "running" - name: Capture boot device details ansible.builtin.import_tasks: tasks/capture_boot_device_details.yml @@ -29,10 +29,6 @@ - name: Capture logical volume information ansible.builtin.import_tasks: tasks/capture_lv_device_details.yml - - name: Set ReaR backup flag - ansible.builtin.set_fact: - bigboot_rear_backup_skip: - - name: Set environment for subsequent workflow nodes ansible.builtin.set_stats: aggregate: true @@ -48,6 +44,15 @@ } }) }}" + - 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" + + - name: Perform a ReaR backup if any disk modifications are to be made ansible.builtin.import_playbook: rhc.rear.rear_backup when: diff --git a/vars/bigboot_vars.yml b/vars/bigboot_vars.yml index 825299f..4f7074d 100644 --- a/vars/bigboot_vars.yml +++ b/vars/bigboot_vars.yml @@ -8,6 +8,8 @@ bigboot_reboot_timeout: 1800 bigboot_skip_rear_backup: false +bigboot_docker_service: docker.service + # Max value in minutes for the timeout threshold: bigboot_service_max_timeout: 5