refactor: make task names unique; fix indentation

the new ansible-lint wants all task names to be unique, and
is more strict about indentation

Signed-off-by: Rich Megginson <[email protected]>

Author: richm

tests/test-verify-pool-members.yml

@@ -45,13 +45,13 @@
       if storage_test_pool.encryption else 'disk' }}"
   when: storage_test_pool.type == 'lvm'
 
-- name: Set expected pv type
+- name: Set expected pv type - 2
   set_fact:
     _storage_test_expected_pv_type: "{{ 'partition'
       if storage_use_partitions | d(false) else 'disk' }}"
   when: storage_test_pool.type == 'lvm' and not storage_test_pool.encryption
 
-- name: Set expected pv type
+- name: Set expected pv type - 3
   set_fact:
     _storage_test_expected_pv_type: "{{ storage_test_pool.raid_level }}"
   when:

tests/test-verify-volume-device.yml

@@ -13,7 +13,7 @@
       Incorrect device node presence for volume {{ storage_test_volume.name }}
   when: _storage_test_volume_present or storage_test_volume.type == 'disk'
 
-- name: Verify the presence/absence of the device node
+- name: Verify the presence/absence of the device node - 2
   assert:
     that: not storage_test_dev.stat.exists
     msg: >-

tests/test-verify-volume-size.yml

@@ -127,7 +127,7 @@
         - storage_test_volume.thin_pool_size is not none
         - "'%' not in storage_test_volume.thin_pool_size"
 
-    - name: Calculate the expected size based on pool size and percentage value
+    - name: Calculate the expected size based on pool size and percentage value - 2
       set_fact:
         storage_test_expected_thin_pool_size: "{{
           (_storage_test_max_thin_pool_size.bytes *
@@ -158,7 +158,7 @@
   debug:
     var: storage_test_actual_size
 
-- name: Show expected size
+- name: Show expected size - 2
   debug:
     var: storage_test_expected_size
 

tests/tests_change_disk_fs.yml

@@ -54,7 +54,7 @@
             fs_type: "{{ fs_type_after }}"
             disks: "{{ unused_disks }}"
 
-    - name: Verify role results
+    - name: Verify role results - 2
       include_tasks: verify-role-results.yml
 
     - name: Repeat the previous invocation to verify idempotence
@@ -68,7 +68,7 @@
             fs_type: "{{ fs_type_after }}"
             disks: "{{ unused_disks }}"
 
-    - name: Verify role results
+    - name: Verify role results - 3
       include_tasks: verify-role-results.yml
 
     - name: Clean up
@@ -82,5 +82,5 @@
             mount_point: "{{ mount_location }}"
             state: absent
 
-    - name: Verify role results
+    - name: Verify role results - 4
       include_tasks: verify-role-results.yml

tests/tests_change_disk_mount.yml

@@ -50,7 +50,7 @@
             mount_point: "{{ mount_location_after }}"
             disks: "{{ unused_disks }}"
 
-    - name: Verify role results
+    - name: Verify role results - 2
       include_tasks: verify-role-results.yml
 
     - name: Repeat the previous invocation to verify idempotence
@@ -63,7 +63,7 @@
             mount_point: "{{ mount_location_after }}"
             disks: "{{ unused_disks }}"
 
-    - name: Verify role results
+    - name: Verify role results - 3
       include_tasks: verify-role-results.yml
 
     - name: Clean up
@@ -77,5 +77,5 @@
             disks: "{{ unused_disks }}"
             state: absent
 
-    - name: Verify role results
+    - name: Verify role results - 4
       include_tasks: verify-role-results.yml

tests/tests_change_fs.yml

@@ -60,7 +60,7 @@
                 fs_type: "{{ fs_after }}"
                 mount_point: "{{ mount_location }}"
 
-    - name: Verify role results
+    - name: Verify role results - 2
       include_tasks: verify-role-results.yml
 
     - name: Re-run the role on the same volume without specifying fs_type
@@ -82,7 +82,7 @@
           - blivet_output.pools[0].volumes[0].fs_type == fs_after
         msg: Failed to preserve omitted fs_type on existing lvm volume
 
-    - name: Verify role results
+    - name: Verify role results - 3
       include_tasks: verify-role-results.yml
 
     - name: Repeat the previous invocation to verify idempotence
@@ -98,7 +98,7 @@
                 fs_type: "{{ fs_after }}"
                 mount_point: "{{ mount_location }}"
 
-    - name: Verify role results
+    - name: Verify role results - 4
       include_tasks: verify-role-results.yml
 
     - name: Remove the FS
@@ -113,7 +113,7 @@
                 size: "{{ volume_size }}"
                 fs_type: unformatted
 
-    - name: Verify role results
+    - name: Verify role results - 5
       include_tasks: verify-role-results.yml
 
 
@@ -131,5 +131,5 @@
                 fs_type: "{{ fs_after }}"
                 mount_point: "{{ mount_location }}"
 
-    - name: Verify role results
+    - name: Verify role results - 6
       include_tasks: verify-role-results.yml

tests/tests_change_fs_use_partitions.yml

@@ -61,7 +61,7 @@
                 fs_type: "{{ fs_type_after }}"
                 mount_point: "{{ mount_location }}"
 
-    - name: Verify role results
+    - name: Verify role results - 2
       include_tasks: verify-role-results.yml
 
     - name: Repeat the previous invocation to verify idempotence
@@ -77,7 +77,7 @@
                 fs_type: "{{ fs_type_after }}"
                 mount_point: "{{ mount_location }}"
 
-    - name: Verify role results
+    - name: Verify role results - 3
       include_tasks: verify-role-results.yml
 
     - name: Clean up
@@ -95,5 +95,5 @@
                 mount_point: "{{ mount_location }}"
                 state: absent
 
-    - name: Verify role results
+    - name: Verify role results - 4
       include_tasks: verify-role-results.yml

tests/tests_change_mount.yml

@@ -56,7 +56,7 @@
                 size: "{{ volume_size }}"
                 mount_point: "{{ mount_location_after }}"
 
-    - name: Verify role results
+    - name: Verify role results - 2
       include_tasks: verify-role-results.yml
 
     - name: Repeat the previous invocation to verify idempotence
@@ -71,7 +71,7 @@
                 size: "{{ volume_size }}"
                 mount_point: "{{ mount_location_after }}"
 
-    - name: Verify role results
+    - name: Verify role results - 3
       include_tasks: verify-role-results.yml
 
     - name: Clean up
@@ -87,5 +87,5 @@
                 size: "{{ volume_size }}"
                 mount_point: "{{ mount_location_after }}"
 
-    - name: Verify role results
+    - name: Verify role results - 4
       include_tasks: verify-role-results.yml

tests/tests_create_disk_then_remove.yml

@@ -64,7 +64,7 @@
           - blivet_output.volumes[0].fs_type == 'ext4'
         msg: File system not preserved on existing partition volume.
 
-    - name: Verify role results
+    - name: Verify role results - 2
       include_tasks: verify-role-results.yml
 
     - name: Remove the disk device created above
@@ -78,5 +78,5 @@
             mount_point: "{{ mount_location }}"
             state: absent
 
-    - name: Verify role results
+    - name: Verify role results - 3
       include_tasks: verify-role-results.yml

tests/tests_create_lv_size_equal_to_vg.yml

@@ -59,5 +59,5 @@
               - name: test1
                 mount_point: "{{ mount_location }}"
 
-    - name: Verify role results
+    - name: Verify role results - 2
       include_tasks: verify-role-results.yml