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