From 7fefca9befff1c82e49b86036d72a102660d511a Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 2 Aug 2024 10:44:46 -0400 Subject: [PATCH 1/5] Notes and log path update --- vars/bigboot_vars.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vars/bigboot_vars.yml b/vars/bigboot_vars.yml index b506917..ba2cd34 100644 --- a/vars/bigboot_vars.yml +++ b/vars/bigboot_vars.yml @@ -24,6 +24,7 @@ bigboot_protected_services: - rhnsd.service - rhnsd - boksm.service + # - # Filename of disabled services log: -bigboot_disabled_services_log: /root/bigboot_disabled_services.log +bigboot_disabled_services_log: /var/ipe/ipu/el7to8/bigboot_disabled_services.log From 7f5d29dfbf15ec6fd81a7ddfd4e69dda61734fb9 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 2 Aug 2024 12:37:55 -0400 Subject: [PATCH 2/5] Test Docker fix --- bigboot_setup_environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml index 43cddbe..4bf7189 100644 --- a/bigboot_setup_environment.yml +++ b/bigboot_setup_environment.yml @@ -12,8 +12,8 @@ - name: Cleanup from any previous executions ansible.builtin.import_tasks: tasks/cleanup.yml - - name: Stop and disable the Docker service if present and running - ansible.builtin.import_tasks: tasks/disable_docker_service.yml + # - name: Stop and disable the Docker service if present and running + # ansible.builtin.import_tasks: tasks/disable_docker_service.yml - name: Set boot device details ansible.builtin.import_tasks: tasks/capture_boot_device_details.yml From 51402c118950a1600b69ce620964bdb744c64217 Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 2 Aug 2024 12:49:17 -0400 Subject: [PATCH 3/5] Docker fix re-implement --- bigboot_setup_environment.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml index 4bf7189..43cddbe 100644 --- a/bigboot_setup_environment.yml +++ b/bigboot_setup_environment.yml @@ -12,8 +12,8 @@ - name: Cleanup from any previous executions ansible.builtin.import_tasks: tasks/cleanup.yml - # - name: Stop and disable the Docker service if present and running - # ansible.builtin.import_tasks: tasks/disable_docker_service.yml + - name: Stop and disable the Docker service if present and running + ansible.builtin.import_tasks: tasks/disable_docker_service.yml - name: Set boot device details ansible.builtin.import_tasks: tasks/capture_boot_device_details.yml From 6f6050cf77bede187d57f597a8ff3b74ccae139d Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 2 Aug 2024 21:08:12 -0400 Subject: [PATCH 4/5] named-chroot initial fix --- bigboot_execute_resize.yml | 8 ++++++++ bigboot_setup_environment.yml | 5 +++++ tasks/disable_named-chroot_service.yml | 25 +++++++++++++++++++++++++ vars/bigboot_vars.yml | 4 ++++ 4 files changed, 42 insertions(+) create mode 100644 tasks/disable_named-chroot_service.yml diff --git a/bigboot_execute_resize.yml b/bigboot_execute_resize.yml index bc85ddb..953e4c6 100644 --- a/bigboot_execute_resize.yml +++ b/bigboot_execute_resize.yml @@ -48,6 +48,14 @@ - name: Ensure service facts are available ansible.builtin.service_facts: + - name: Restore named-chroot service to its pre-Bigboot state + ansible.builtin.service: + name: "{{ bigboot_named_chroot_service }}" + state: "{{ bigboot_data[inventory_hostname]['bigboot_named_chroot_running'] }}" + enabled: "{{ bigboot_data[inventory_hostname]['bigboot_named_chroot_enabled'] }}" + when: + - ansible_facts['services'][bigboot_named_chroot_service] is defined + - name: Restore Docker service to its pre-Bigboot state ansible.builtin.service: name: "{{ bigboot_docker_service }}" diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml index 43cddbe..fc3b561 100644 --- a/bigboot_setup_environment.yml +++ b/bigboot_setup_environment.yml @@ -15,6 +15,9 @@ - name: Stop and disable the Docker service if present and running ansible.builtin.import_tasks: tasks/disable_docker_service.yml + - name: Stop and disable the named-chroot service if present and running + ansible.builtin.import_tasks: tasks/disable_docker_service.yml + - name: Set boot device details ansible.builtin.import_tasks: tasks/capture_boot_device_details.yml @@ -35,6 +38,8 @@ 'bigboot_size': bigboot_size, 'bigboot_docker_running': bigboot_docker_running, 'bigboot_docker_enabled': bigboot_docker_enabled, + 'bigboot_named_chroot_running': bigboot_named_chroot_running, + 'bigboot_named_chroot_enabled': bigboot_named_chroot_enabled, 'ip_addresses': ansible_all_ipv4_addresses, 'server_hostname': ansible_hostname } diff --git a/tasks/disable_named-chroot_service.yml b/tasks/disable_named-chroot_service.yml new file mode 100644 index 0000000..c526e8d --- /dev/null +++ b/tasks/disable_named-chroot_service.yml @@ -0,0 +1,25 @@ +--- +- name: Ensure service facts are available + ansible.builtin.service_facts: + +- name: Set named-chroot state + when: + - ansible_facts['services'][bigboot_named_chroot_service] is defined + block: + - name: Set named-chroot running state + ansible.builtin.set_fact: + bigboot_named_chroot_running: started + when: + - ansible_facts['services'][bigboot_named_chroot_service]['state'] == "running" + + - name: Set named-chroot enabled state + ansible.builtin.set_fact: + bigboot_named_chroot_enabled: true + when: + - ansible_facts['services'][bigboot_named_chroot_service]['status'] == "enabled" + + - name: Ensure named-chroot service is stopped and disabled + ansible.builtin.service: + name: "{{ bigboot_named_chroot_service }}" + state: stopped + enabled: false diff --git a/vars/bigboot_vars.yml b/vars/bigboot_vars.yml index ba2cd34..2e14b38 100644 --- a/vars/bigboot_vars.yml +++ b/vars/bigboot_vars.yml @@ -12,6 +12,10 @@ bigboot_docker_service: docker.service bigboot_docker_running: stopped bigboot_docker_enabled: false +bigboot_named_chroot_service: named-chroot.service +bigboot_named_chroot_running: stopped +bigboot_named_chroot_enabled: false + # Max value in minutes for the timeout threshold: bigboot_service_max_timeout: 5 From 6fb410cffd10e379999bc87e9dfe3874a0ffa89f Mon Sep 17 00:00:00 2001 From: Chris Hammer Date: Fri, 2 Aug 2024 21:12:19 -0400 Subject: [PATCH 5/5] fix file references --- bigboot_setup_environment.yml | 2 +- ...amed-chroot_service.yml => disable_named_chroot_service.yml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tasks/{disable_named-chroot_service.yml => disable_named_chroot_service.yml} (100%) diff --git a/bigboot_setup_environment.yml b/bigboot_setup_environment.yml index fc3b561..7b39b16 100644 --- a/bigboot_setup_environment.yml +++ b/bigboot_setup_environment.yml @@ -16,7 +16,7 @@ ansible.builtin.import_tasks: tasks/disable_docker_service.yml - name: Stop and disable the named-chroot service if present and running - ansible.builtin.import_tasks: tasks/disable_docker_service.yml + ansible.builtin.import_tasks: tasks/disable_named_chroot_service.yml - name: Set boot device details ansible.builtin.import_tasks: tasks/capture_boot_device_details.yml diff --git a/tasks/disable_named-chroot_service.yml b/tasks/disable_named_chroot_service.yml similarity index 100% rename from tasks/disable_named-chroot_service.yml rename to tasks/disable_named_chroot_service.yml