[stable-10] Adjust YAML files (#10233) (#10244)

Adjust YAML files (#10233) Adjust YAML files. (cherry picked from commit eaa5e07b28)
2025-07-28 23:51:23 -07:00 · 2025-06-15 10:02:03 +02:00 · 2025-06-15 10:02:03 +02:00 · a9e892952d
commit a9e892952d
parent e8ff74f077
244 changed files with 7272 additions and 7329 deletions
--- a/tests/integration/targets/btrfs_subvolume/tasks/main.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/main.yml
@ -8,22 +8,22 @@
    name:
      - btrfs-progs # btrfs userspace
      - util-linux # losetup
-  ignore_errors: True
+  ignore_errors: true
  register: btrfs_installed

 - name: Execute integration tests tests
  block:
-  - ansible.builtin.include_tasks: 'setup.yml'
+    - ansible.builtin.include_tasks: 'setup.yml'

-  - name: "Execute test scenario for single device filesystem"
-    ansible.builtin.include_tasks: 'run_filesystem_tests.yml'
-    vars:
-      btrfs_subvolume_target_device: "{{ btrfs_subvolume_single_devices | first }}"
-      btrfs_subvolume_target_label: "{{ btrfs_subvolume_single_label }}"
+    - name: "Execute test scenario for single device filesystem"
+      ansible.builtin.include_tasks: 'run_filesystem_tests.yml'
+      vars:
+        btrfs_subvolume_target_device: "{{ btrfs_subvolume_single_devices | first }}"
+        btrfs_subvolume_target_label: "{{ btrfs_subvolume_single_label }}"

-  - name: "Execute test scenario for multiple device configuration"
-    ansible.builtin.include_tasks: 'run_filesystem_tests.yml'
-    vars:
-      btrfs_subvolume_target_device: "{{ btrfs_subvolume_multiple_devices | first }}"
-      btrfs_subvolume_target_label: "{{ btrfs_subvolume_multiple_label }}"
+    - name: "Execute test scenario for multiple device configuration"
+      ansible.builtin.include_tasks: 'run_filesystem_tests.yml'
+      vars:
+        btrfs_subvolume_target_device: "{{ btrfs_subvolume_multiple_devices | first }}"
+        btrfs_subvolume_target_label: "{{ btrfs_subvolume_multiple_label }}"
  when: btrfs_installed is success
--- a/tests/integration/targets/btrfs_subvolume/tasks/run_filesystem_tests.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/run_filesystem_tests.yml
@ -10,23 +10,23 @@

 - name: "Execute test scenarios where non-root subvolume is mounted"
  block:
-  - name: Create subvolume '/nonroot'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      name: "/nonroot"
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      state: "present"
-    register: nonroot
-  - name: "Mount subvolume '/nonroot'"
-    ansible.posix.mount:
-      src: "{{ nonroot.filesystem.devices | first }}"
-      path: /mnt
-      opts: "subvolid={{ nonroot.target_subvolume_id }}"
-      fstype: btrfs
-      state: mounted
-  - name: "Run tests for explicit, mounted single device configuration"
-    ansible.builtin.include_tasks: 'run_common_tests.yml'
-  - name: "Unmount subvolume /nonroot"
-    ansible.posix.mount:
-      path: /mnt
-      state: absent
+    - name: Create subvolume '/nonroot'
+      community.general.btrfs_subvolume:
+        automount: true
+        name: "/nonroot"
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        state: "present"
+      register: nonroot
+    - name: "Mount subvolume '/nonroot'"
+      ansible.posix.mount:
+        src: "{{ nonroot.filesystem.devices | first }}"
+        path: /mnt
+        opts: "subvolid={{ nonroot.target_subvolume_id }}"
+        fstype: btrfs
+        state: mounted
+    - name: "Run tests for explicit, mounted single device configuration"
+      ansible.builtin.include_tasks: 'run_common_tests.yml'
+    - name: "Unmount subvolume /nonroot"
+      ansible.posix.mount:
+        path: /mnt
+        state: absent
--- a/tests/integration/targets/btrfs_subvolume/tasks/setup.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/setup.yml
@ -18,12 +18,12 @@
 - name: Create single device btrfs filesystem
  ansible.builtin.command:
    cmd: "mkfs.btrfs --label {{ btrfs_subvolume_single_label }} -f {{ btrfs_subvolume_single_devices | first }}"
-  changed_when: True
+  changed_when: true

 - name: Create multiple device btrfs filesystem
  ansible.builtin.command:
    cmd: "mkfs.btrfs --label {{ btrfs_subvolume_multiple_label }} -f -d raid0 {{ btrfs_subvolume_multiple_devices | join(' ') }}"
-  changed_when: True
+  changed_when: true

 # Typically created by udev, but apparently missing on Alpine
 - name: Create btrfs control device node
@ -34,4 +34,4 @@
 - name: Force rescan to ensure all device are detected
  ansible.builtin.command:
    cmd: "btrfs device scan"
-  changed_when: True
+  changed_when: true
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_filesystem_matching.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_filesystem_matching.yml
@ -5,76 +5,76 @@

 - name: "Match targeted filesystem by label"
  block:
-  - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by label
-    community.general.btrfs_subvolume:
-      automount: Yes
-      name: "/match_label"
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      state: "present"
-    register: result
+    - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by label
+      community.general.btrfs_subvolume:
+        automount: true
+        name: "/match_label"
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        state: "present"
+      register: result

-  - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
-    ansible.builtin.assert:
-      that:
-        - result.filesystem.label == btrfs_subvolume_target_label
+    - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
+      ansible.builtin.assert:
+        that:
+          - result.filesystem.label == btrfs_subvolume_target_label

 - name: "Match targeted filesystem by uuid"
  block:
-  - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by uuid
-    community.general.btrfs_subvolume:
-      automount: Yes
-      name: "/match_uuid"
-      filesystem_uuid: "{{ result.filesystem.uuid }}"
-      state: "present"
-    register: result
+    - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by uuid
+      community.general.btrfs_subvolume:
+        automount: true
+        name: "/match_uuid"
+        filesystem_uuid: "{{ result.filesystem.uuid }}"
+        state: "present"
+      register: result

-  - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
-    ansible.builtin.assert:
-      that:
-        - result.filesystem.label == btrfs_subvolume_target_label
+    - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
+      ansible.builtin.assert:
+        that:
+          - result.filesystem.label == btrfs_subvolume_target_label

 - name: "Match targeted filesystem by devices"
  block:
-  - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by device
-    community.general.btrfs_subvolume:
-      automount: Yes
-      name: "/match_device"
-      filesystem_device: "{{ result.filesystem.devices | first }}"
-      state: "present"
-    register: result
+    - name: Match '{{ btrfs_subvolume_target_label }}' filesystem by device
+      community.general.btrfs_subvolume:
+        automount: true
+        name: "/match_device"
+        filesystem_device: "{{ result.filesystem.devices | first }}"
+        state: "present"
+      register: result

-  - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
-    ansible.builtin.assert:
-      that:
-        - result.filesystem.label == btrfs_subvolume_target_label
+    - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
+      ansible.builtin.assert:
+        that:
+          - result.filesystem.label == btrfs_subvolume_target_label

 - name: "Match only mounted filesystem"
  block:
-  - name: "Mount filesystem '{{ btrfs_subvolume_target_label }}'"
-    ansible.posix.mount:
-      src: "{{ result.filesystem.devices | first }}"
-      path: /mnt
-      opts: "subvolid={{ 5 }}"
-      fstype: btrfs
-      state: mounted
+    - name: "Mount filesystem '{{ btrfs_subvolume_target_label }}'"
+      ansible.posix.mount:
+        src: "{{ result.filesystem.devices | first }}"
+        path: /mnt
+        opts: "subvolid={{ 5 }}"
+        fstype: btrfs
+        state: mounted

-  - name: Print current status
-    community.general.btrfs_info:
+    - name: Print current status
+      community.general.btrfs_info:

-  - name: Match '{{ btrfs_subvolume_target_label }}' filesystem when only mount
-    community.general.btrfs_subvolume:
-      automount: Yes
-      name: "/match_only_mounted"
-      state: "present"
-    register: result
+    - name: Match '{{ btrfs_subvolume_target_label }}' filesystem when only mount
+      community.general.btrfs_subvolume:
+        automount: true
+        name: "/match_only_mounted"
+        state: "present"
+      register: result

-  - name: "Unmount filesystem '{{ btrfs_subvolume_target_label }}'"
-    ansible.posix.mount:
-      path: /mnt
-      state: absent
+    - name: "Unmount filesystem '{{ btrfs_subvolume_target_label }}'"
+      ansible.posix.mount:
+        path: /mnt
+        state: absent

-  - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
-    ansible.builtin.assert:
-      that:
-        - result.filesystem.label == btrfs_subvolume_target_label
-  when: False  # TODO don't attempt this if the host already has a pre-existing btrfs filesystem
+    - name: Validate the '{{ btrfs_subvolume_target_label }}' filesystem was chosen
+      ansible.builtin.assert:
+        that:
+          - result.filesystem.label == btrfs_subvolume_target_label
+  when: false  # TODO don't attempt this if the host already has a pre-existing btrfs filesystem
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_clobber.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_clobber.yml
@ -5,37 +5,37 @@

 - name: Create a snapshot, overwriting if one already exists at path
  block:
-  - name: Create a snapshot named 'snapshot_clobber'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_clobber"
-      snapshot_source: "/"
-      snapshot_conflict: "clobber"
-      state: "present"
-    register: result
-  - name: Snapshot 'snapshot_clobber' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a snapshot named 'snapshot_clobber'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_clobber"
+        snapshot_source: "/"
+        snapshot_conflict: "clobber"
+        state: "present"
+      register: result
+    - name: Snapshot 'snapshot_clobber' created
+      ansible.builtin.assert:
+        that:
+          - result is changed

-  - name: Create a snapshot named 'snapshot_clobber' (no idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_clobber"
-      snapshot_source: "/"
-      snapshot_conflict: "clobber"
-      state: "present"
-    register: result
-  - name: Snapshot 'snapshot_clobber' created (no idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a snapshot named 'snapshot_clobber' (no idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_clobber"
+        snapshot_source: "/"
+        snapshot_conflict: "clobber"
+        state: "present"
+      register: result
+    - name: Snapshot 'snapshot_clobber' created (no idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is changed

 - name: Cleanup created snapshot
  community.general.btrfs_subvolume:
-    automount: Yes
+    automount: true
    filesystem_label: "{{ btrfs_subvolume_target_label }}"
    name: "/snapshot_clobber"
    state: "absent"
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_error.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_error.yml
@ -5,38 +5,38 @@

 - name: Create a snapshot, erroring if one already exists at path
  block:
-  - name: Create a snapshot named 'snapshot_error'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_error"
-      snapshot_source: "/"
-      snapshot_conflict: "error"
-      state: "present"
-    register: result
-  - name: Snapshot 'snapshot_error' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a snapshot named 'snapshot_error'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_error"
+        snapshot_source: "/"
+        snapshot_conflict: "error"
+        state: "present"
+      register: result
+    - name: Snapshot 'snapshot_error' created
+      ansible.builtin.assert:
+        that:
+          - result is changed

-  - name: Create a snapshot named 'snapshot_error' (no idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_error"
-      snapshot_source: "/"
-      snapshot_conflict: "error"
-      state: "present"
-    register: result
-    ignore_errors: true
-  - name: Snapshot 'snapshot_error' created (no idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a snapshot named 'snapshot_error' (no idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_error"
+        snapshot_source: "/"
+        snapshot_conflict: "error"
+        state: "present"
+      register: result
+      ignore_errors: true
+    - name: Snapshot 'snapshot_error' created (no idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed

 - name: Cleanup created snapshot
  community.general.btrfs_subvolume:
-    automount: Yes
+    automount: true
    filesystem_label: "{{ btrfs_subvolume_target_label }}"
    name: "/snapshot_error"
    state: "absent"
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_skip.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_snapshot_skip.yml
@ -5,37 +5,37 @@

 - name: Create a snapshot if one does not already exist at path
  block:
-  - name: Create a snapshot named 'snapshot_skip'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_skip"
-      snapshot_source: "/"
-      snapshot_conflict: "skip"
-      state: "present"
-    register: result
-  - name: Snapshot 'snapshot_skip' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a snapshot named 'snapshot_skip'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_skip"
+        snapshot_source: "/"
+        snapshot_conflict: "skip"
+        state: "present"
+      register: result
+    - name: Snapshot 'snapshot_skip' created
+      ansible.builtin.assert:
+        that:
+          - result is changed

-  - name: Create a snapshot named 'snapshot_skip' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/snapshot_skip"
-      snapshot_source: "/"
-      snapshot_conflict: "skip"
-      state: "present"
-    register: result
-  - name: Snapshot 'snapshot_skip' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a snapshot named 'snapshot_skip' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/snapshot_skip"
+        snapshot_source: "/"
+        snapshot_conflict: "skip"
+        state: "present"
+      register: result
+    - name: Snapshot 'snapshot_skip' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed

 - name: Cleanup created snapshot
  community.general.btrfs_subvolume:
-    automount: Yes
+    automount: true
    filesystem_label: "{{ btrfs_subvolume_target_label }}"
    name: "/snapshot_skip"
    state: "absent"
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_default.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_default.yml
@ -5,95 +5,95 @@

 - name: Change the default subvolume
  block:
-  - name: Update filesystem default subvolume to '@'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      default: True
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/@"
-      state: "present"
-    register: result
-  - name: Subvolume '@' set to default
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Update filesystem default subvolume to '@' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      default: True
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/@"
-      state: "present"
-    register: result
-  - name: Subvolume '@' set to default (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Update filesystem default subvolume to '@'
+      community.general.btrfs_subvolume:
+        automount: true
+        default: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/@"
+        state: "present"
+      register: result
+    - name: Subvolume '@' set to default
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Update filesystem default subvolume to '@' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        default: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/@"
+        state: "present"
+      register: result
+    - name: Subvolume '@' set to default (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed

 - name: Revert the default subvolume
  block:
-  - name: Revert filesystem default subvolume to '/'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      default: True
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/"
-      state: "present"
-    register: result
-  - name: Subvolume '/' set to default
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Revert filesystem default subvolume to '/' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      default: True
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/"
-      state: "present"
-    register: result
-  - name: Subvolume '/' set to default (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Revert filesystem default subvolume to '/'
+      community.general.btrfs_subvolume:
+        automount: true
+        default: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/"
+        state: "present"
+      register: result
+    - name: Subvolume '/' set to default
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Revert filesystem default subvolume to '/' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        default: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/"
+        state: "present"
+      register: result
+    - name: Subvolume '/' set to default (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed


 - name: Change the default subvolume again
  block:
-  - name: Update filesystem default subvolume to '@'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      default: True
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/@"
-      state: "present"
-    register: result
-  - name: Subvolume '@' set to default
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Update filesystem default subvolume to '@'
+      community.general.btrfs_subvolume:
+        automount: true
+        default: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/@"
+        state: "present"
+      register: result
+    - name: Subvolume '@' set to default
+      ansible.builtin.assert:
+        that:
+          - result is changed

 - name: Revert custom default subvolume to fs_tree root when deleted
  block:
-  - name: Delete custom default subvolume '@'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/@"
-      state: "absent"
-    register: result
-  - name: Subvolume '@' deleted
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Delete custom default subvolume '@' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/@"
-      state: "absent"
-    register: result
-  - name: Subvolume '@' deleted (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Delete custom default subvolume '@'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/@"
+        state: "absent"
+      register: result
+    - name: Subvolume '@' deleted
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Delete custom default subvolume '@' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/@"
+        state: "absent"
+      register: result
+    - name: Subvolume '@' deleted (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_nested.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_nested.yml
@ -5,57 +5,57 @@

 - name: Create parent subvolume 'container'
  community.general.btrfs_subvolume:
-    automount: Yes
+    automount: true
    filesystem_label: "{{ btrfs_subvolume_target_label }}"
    name: "/container"
    state: "present"

 - name: Create a nested subvolume
  block:
-  - name: Create a subvolume named 'nested' inside 'container'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/nested"
-      state: "present"
-    register: result
-  - name: Subvolume 'container/nested' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Create a subvolume named 'nested' inside 'container' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/nested"
-      state: "present"
-    register: result
-  - name: Subvolume 'container/nested' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a subvolume named 'nested' inside 'container'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/nested"
+        state: "present"
+      register: result
+    - name: Subvolume 'container/nested' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Create a subvolume named 'nested' inside 'container' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/nested"
+        state: "present"
+      register: result
+    - name: Subvolume 'container/nested' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed

 - name: Remove a nested subvolume
  block:
-  - name: Remove a subvolume named 'nested' inside 'container'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/nested"
-      state: "absent"
-    register: result
-  - name: Subvolume 'container/nested' removed
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Remove a subvolume named 'nested' inside 'container' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/nested"
-      state: "absent"
-    register: result
-  - name: Subvolume 'container/nested' removed (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Remove a subvolume named 'nested' inside 'container'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/nested"
+        state: "absent"
+      register: result
+    - name: Subvolume 'container/nested' removed
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Remove a subvolume named 'nested' inside 'container' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/nested"
+        state: "absent"
+      register: result
+    - name: Subvolume 'container/nested' removed (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_recursive.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_recursive.yml
@ -5,82 +5,82 @@

 - name: Recursively create subvolumes
  block:
-  - name: Create a subvolume named '/recursive/son/grandson'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive/son/grandson"
-      recursive: Yes
-      state: "present"
-    register: result
-  - name: Subvolume named '/recursive/son/grandson' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a subvolume named '/recursive/son/grandson'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive/son/grandson"
+        recursive: true
+        state: "present"
+      register: result
+    - name: Subvolume named '/recursive/son/grandson' created
+      ansible.builtin.assert:
+        that:
+          - result is changed

-  - name: Create a subvolume named '/recursive/son/grandson' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive/son/grandson"
-      recursive: Yes
-      state: "present"
-    register: result
-  - name: Subvolume named '/recursive/son/grandson' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a subvolume named '/recursive/son/grandson' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive/son/grandson"
+        recursive: true
+        state: "present"
+      register: result
+    - name: Subvolume named '/recursive/son/grandson' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed

-  - name: Create a subvolume named '/recursive/daughter/granddaughter'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive/daughter/granddaughter"
-      recursive: Yes
-      state: "present"
-    register: result
-  - name: Subvolume named '/recursive/son/grandson' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Create a subvolume named '/recursive/daughter/granddaughter'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive/daughter/granddaughter"
+        recursive: true
+        state: "present"
+      register: result
+    - name: Subvolume named '/recursive/son/grandson' created
+      ansible.builtin.assert:
+        that:
+          - result is changed

-  - name: Create a subvolume named '/recursive/daughter/granddaughter' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive/daughter/granddaughter"
-      recursive: Yes
-      state: "present"
-    register: result
-  - name: Subvolume named '/recursive/son/grandson' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a subvolume named '/recursive/daughter/granddaughter' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive/daughter/granddaughter"
+        recursive: true
+        state: "present"
+      register: result
+    - name: Subvolume named '/recursive/son/grandson' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed

 - name: Recursively remove subvolumes
  block:
-  - name: Remove subvolume '/recursive' and all descendents
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive"
-      recursive: Yes
-      state: "absent"
-    register: result
-  - name: Subvolume '/recursive' removed
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Remove subvolume '/recursive' and all descendents
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive"
+        recursive: true
+        state: "absent"
+      register: result
+    - name: Subvolume '/recursive' removed
+      ansible.builtin.assert:
+        that:
+          - result is changed

-  - name: Remove subvolume '/recursive' and all descendents (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/recursive"
-      recursive: Yes
-      state: "absent"
-    register: result
-  - name: Subvolume '/recursive' removed (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Remove subvolume '/recursive' and all descendents (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/recursive"
+        recursive: true
+        state: "absent"
+      register: result
+    - name: Subvolume '/recursive' removed (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_simple.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_simple.yml
@ -5,50 +5,50 @@

 - name: Create a simple subvolume
  block:
-  - name: Create a subvolume named 'simple'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/simple"
-      state: "present"
-    register: result
-  - name: Subvolume named 'simple' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Create a subvolume named 'simple' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/simple"
-      state: "present"
-    register: result
-  - name: Subvolume named 'simple' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a subvolume named 'simple'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/simple"
+        state: "present"
+      register: result
+    - name: Subvolume named 'simple' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Create a subvolume named 'simple' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/simple"
+        state: "present"
+      register: result
+    - name: Subvolume named 'simple' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed

 - name: Remove a simple subvolume
  block:
-  - name: Remove a subvolume named 'simple'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/simple"
-      state: "absent"
-    register: result
-  - name: Subvolume named 'simple' removed
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Remove a subvolume named 'simple' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/simple"
-      state: "absent"
-    register: result
-  - name: Subvolume named 'simple' removed (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Remove a subvolume named 'simple'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/simple"
+        state: "absent"
+      register: result
+    - name: Subvolume named 'simple' removed
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Remove a subvolume named 'simple' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/simple"
+        state: "absent"
+      register: result
+    - name: Subvolume named 'simple' removed (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed
--- a/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_whitespace.yml
+++ b/tests/integration/targets/btrfs_subvolume/tasks/test_subvolume_whitespace.yml
@ -5,58 +5,58 @@

 - name: Create a subvolume named 'container'
  community.general.btrfs_subvolume:
-    automount: Yes
+    automount: true
    filesystem_label: "{{ btrfs_subvolume_target_label }}"
    name: "/container"
    state: "present"

 - name: Create a subvolume with whitespace in the name
  block:
-  - name: Create a subvolume named 'container/my data'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/my data"
-      state: "present"
-    register: result
-  - name: Subvolume named 'container/my data' created
-    ansible.builtin.assert:
-      that:
-      - result is changed
-  - name: Create a subvolume named 'container/my data' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/my data"
-      state: "present"
-    register: result
-  - name: Subvolume named 'container/my data' created (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Create a subvolume named 'container/my data'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/my data"
+        state: "present"
+      register: result
+    - name: Subvolume named 'container/my data' created
+      ansible.builtin.assert:
+        that:
+          - result is changed
+    - name: Create a subvolume named 'container/my data' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/my data"
+        state: "present"
+      register: result
+    - name: Subvolume named 'container/my data' created (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed

 - name: Remove a subvolume with whitespace in the name
  block:
-  - name: Remove a subvolume named 'container/my data'
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/my data"
-      state: "absent"
-    register: result
-  - name: Subvolume named 'container/my data' removed
-    ansible.builtin.assert:
-      that:
-      - result is changed
+    - name: Remove a subvolume named 'container/my data'
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/my data"
+        state: "absent"
+      register: result
+    - name: Subvolume named 'container/my data' removed
+      ansible.builtin.assert:
+        that:
+          - result is changed

-  - name: Remove a subvolume named 'container/my data' (idempotency)
-    community.general.btrfs_subvolume:
-      automount: Yes
-      filesystem_label: "{{ btrfs_subvolume_target_label }}"
-      name: "/container/my data"
-      state: "absent"
-    register: result
-  - name: Subvolume named 'container/my data' removed (idempotency)
-    ansible.builtin.assert:
-      that:
-      - result is not changed
+    - name: Remove a subvolume named 'container/my data' (idempotency)
+      community.general.btrfs_subvolume:
+        automount: true
+        filesystem_label: "{{ btrfs_subvolume_target_label }}"
+        name: "/container/my data"
+        state: "absent"
+      register: result
+    - name: Subvolume named 'container/my data' removed (idempotency)
+      ansible.builtin.assert:
+        that:
+          - result is not changed