Compare commits

...

3 commits

Author SHA1 Message Date
Abhijeet Kasurde
eead50b287
Apply suggestions from code review 2025-03-26 12:36:08 -07:00
Simon Leary
4ff0e3aa13 remove assertion of changed 2025-03-26 15:20:42 -04:00
Simon Leary
979f00ce75 fix lint errors 2025-03-26 15:18:35 -04:00

View file

@ -134,7 +134,7 @@
register: bind_result_freebsd_dry_run register: bind_result_freebsd_dry_run
check_mode: true check_mode: true
- name: attempt to stat bind mounted file - name: Attempt to stat bind mounted file
ansible.builtin.stat: ansible.builtin.stat:
path: '{{ output_dir }}/mount_dest/test_file' path: '{{ output_dir }}/mount_dest/test_file'
when: ansible_system in ('FreeBSD', 'Linux') when: ansible_system in ('FreeBSD', 'Linux')
@ -143,11 +143,7 @@
- name: Assert the bind mount did not take place - name: Assert the bind mount did not take place
ansible.builtin.assert: ansible.builtin.assert:
that: that:
- linux_and_changed or freebsd_and_changed
- not dest_stat['stat']['exists'] - not dest_stat['stat']['exists']
vars:
linux_and_changed: "{{ ansible_system == 'Linux' and bind_result_linux_dry_run['changed'] }}"
freebsd_and_changed: "{{ ansible_system == 'FreeBSD' and bind_result_freebsd['changed'] }}"
when: ansible_system in ('FreeBSD', 'Linux') when: ansible_system in ('FreeBSD', 'Linux')
# bind mount # bind mount
@ -330,12 +326,12 @@
when: ansible_system in ('FreeBSD', 'Linux') when: ansible_system in ('FreeBSD', 'Linux')
# SWAP ############################################################# # SWAP #############################################################
- name: swap - name: Swap
when: ansible_system in ('Linux') when: ansible_system in ('Linux')
block: block:
# mount swap check mode # mount swap check mode
- name: Stat /etc/fstab - name: Stat /etc/fstab
stat: ansible.builtin.stat:
path: /etc/fstab path: /etc/fstab
register: stat_fstab_before register: stat_fstab_before
@ -349,7 +345,7 @@
check_mode: true check_mode: true
- name: Stat /etc/fstab - name: Stat /etc/fstab
stat: ansible.builtin.stat:
path: /etc/fstab path: /etc/fstab
register: stat_fstab_after register: stat_fstab_after
@ -410,7 +406,7 @@
# remove swap check mode # remove swap check mode
- name: Stat /etc/fstab - name: Stat /etc/fstab
stat: ansible.builtin.stat:
path: /etc/fstab path: /etc/fstab
register: stat_fstab_before register: stat_fstab_before
@ -422,7 +418,7 @@
check_mode: true check_mode: true
- name: Stat /etc/fstab - name: Stat /etc/fstab
stat: ansible.builtin.stat:
path: /etc/fstab path: /etc/fstab
register: stat_fstab_after register: stat_fstab_after
@ -474,7 +470,7 @@
- not swap2_removed_again['changed'] - not swap2_removed_again['changed']
# FIXUP ############################################################# # FIXUP #############################################################
- name: fix incomplete entry already present in fstab - name: Fix incomplete entry already present in fstab
when: ansible_system == 'Linux' when: ansible_system == 'Linux'
block: block:
- name: Create fstab record with missing last two fields - name: Create fstab record with missing last two fields
@ -834,7 +830,7 @@
failed_when: false failed_when: false
changed_when: false changed_when: false
- name: Assert the mount occured and the fstab is unchanged - name: Assert the mount occurred and the fstab is unchanged
ansible.builtin.assert: ansible.builtin.assert:
that: that:
- check_mountinfo.stdout|int == 0 - check_mountinfo.stdout|int == 0