Merge 5bc6f636f7 into daca208c0b

changelogs/fragments/569_keep_mountpoint.yml

@@ -1,3 +0,0 @@
----
-minor_changes:
-- keep_mountpoint - added keep_mountpoint option with default value false. If set to true keep_mountpoint changes the behaviour of state\: absent by keeping the mountpoint.

plugins/modules/mount.py

@@ -186,23 +186,6 @@ EXAMPLES = r'''
     path: /tmp/mnt-pnt
     state: remounted
 
-# The following will fail on first run
-# if /home/mydir is not empty after unmounting,
-# though unmount and remove from fstab are successfull.
-# It will be successfull on subsequent runs (already unmounted).
-- name: Unmount and remove from fstab, then if unmount was necessary try to remove mountpoint /home/mydir
-  ansible.posix.mount:
-    path: /home/mydir
-    state: absent
-# The following will not fail on first run
-# if /home/mydir is not empty after unmounting.
-# It will leave /home/mydir and its content (if any) after unmounting.
-- name: Unmount and remove from fstab, but keep /home/mydir
-  ansible.posix.mount:
-    path: /home/mydir
-    state: absent
-    keep_mountpoint: true
-
 # The following will not save changes to fstab, and only be temporary until
 # a reboot, or until calling "state: unmounted" followed by "state: mounted"
 # on the same "path"

tests/integration/targets/mount/tasks/main.yml

@@ -808,85 +808,3 @@
       loop:
         - /tmp/myfs.img
         - /tmp/myfs
-
-- name: Block to test keep_mountpoint option
-  block:
-  - name: Create the mount point
-    ansible.builtin.file:
-      state: directory
-      path: '/tmp/myfs'
-      mode: '0755'
-
-  - name: Create empty file for FS aaa
-    community.general.filesize:
-      path: /tmp/myfs.img
-      size: 20M
-
-  - name: Format FS bbb
-    community.general.filesystem:
-      fstype: xfs
-      dev: /tmp/myfs.img
-
-  - name: Put data in the mount point before mounting
-    ansible.builtin.copy:
-      content: 'Testing
-        This is the data before mounting
-        '
-      dest: '/tmp/myfs/test_file'
-      mode: '0644'
-    register: file_before_info
-
-  - name: Mount with fstab
-    ansible.posix.mount:
-      path: '/tmp/myfs'
-      fstype: xfs
-      state: mounted
-      src: '/tmp/myfs.img'
-
-  - name: Check data disappears - stat data
-    ansible.builtin.stat:
-      path: '/tmp/myfs/test_file'
-    register: file_stat_after_mount
-  - name: Check data disappears - file does not exist
-    ansible.builtin.assert:
-      that:
-      - file_stat_after_mount['stat']['exists'] == false
-  - name: Put data in the mount point after mounting
-    ansible.builtin.copy:
-      content: 'Testing
-        This is the data updated after mounting
-        '
-      dest: '/tmp/myfs/test_file'
-      mode: '0644'
-    register: file_after_info
-  - name: Umount with keep_mountpoint
-    ansible.posix.mount:
-      path: '/tmp/myfs'
-      fstype: xfs
-      state: absent
-      keep_mountpoint: true
-  - name: Check original data reappears - stat data
-    ansible.builtin.stat:
-      path: '/tmp/myfs/test_file'
-    register: file_stat_after_umount
-  - name: Check original data reappears - compare checksums
-    ansible.builtin.assert:
-      that:
-      - file_stat_after_umount['stat']['checksum'] == file_before_info['checksum']
-  always:
-    - name: Remove the first test file
-      ansible.builtin.file:
-        path: /tmp/myfs/test_file
-        state: absent
-    - name: Unmount FS
-      ansible.posix.mount:
-        path: /tmp/myfs
-        state: absent
-    - name: Remove the test FS and the second test file
-      ansible.builtin.file:
-        path: '{{ item }}'
-        state: absent
-      loop:
-        - /tmp/myfs/test_file
-        - /tmp/myfs.img
-        - /tmp/myfs