Merge 5bc6f636f7 into daca208c0b

Update mount.py
still a trailing whitespace
2026-01-12 07:35:31 +01:00 · 2024-10-11 16:45:39 +09:00 · 2024-10-04 09:08:03 +02:00 · 2024-10-03 17:27:18 +02:00 · 2024-10-03 13:32:42 +02:00 · 2024-10-03 11:36:45 +02:00
1 changed files with 14 additions and 2 deletions
--- a/plugins/modules/mount.py
+++ b/plugins/modules/mount.py
@ -87,7 +87,8 @@ options:
        real source. V(absent) does not unmount recursively, and the module will
        fail if multiple devices are mounted on the same mount point. Using
        V(absent) with a mount point that is not registered in the I(fstab) has
-        no effect, use V(unmounted) instead.
+        no effect, use V(unmounted) instead. You can set O(keep_mountpoint) to
+        True to keep the mountpoint.
      - V(remounted) specifies that the device will be remounted for when you
        want to force a refresh on the mount itself (added in 2.9). This will
        always return RV(ignore:changed=true). If O(opts) is set, the options will be
@ -132,6 +133,16 @@ options:
        the original file back if you somehow clobbered it incorrectly.
    type: bool
    default: false
+  keep_mountpoint:
+    description:
+    - Change the default behaviour of state=absent by keeping the mountpoint
+    - With keep_mountpoint=true, state=absent is like unmounted plus the
+      fstab update.
+    - Use it if you care about finding original mountpoint content without failing
+      and want to remove the entry in fstab. If you have no entry to clean in
+      fstab you can use state=unmounted
+    type: bool
+    default: false
 notes:
  - As of Ansible 2.3, the O(name) option has been changed to O(path) as
    default, but O(name) still works as well.
@ -779,6 +790,7 @@ def main():
            src=dict(type='path'),
            backup=dict(type='bool', default=False),
            state=dict(type='str', required=True, choices=['absent', 'absent_from_fstab', 'mounted', 'present', 'unmounted', 'remounted', 'ephemeral']),
+            keep_mountpoint=dict(type='bool', default=False),
        ),
        supports_check_mode=True,
        required_if=(
@ -896,7 +908,7 @@ def main():
                    module.fail_json(
                        msg="Error unmounting %s: %s" % (name, msg))

-            if os.path.exists(name):
+            if os.path.exists(name) and module.params['keep_mountpoint'] is False:
                try:
                    os.rmdir(name)
                except (OSError, IOError) as e:
Author	SHA1	Message	Date
Yves MOYROUD	dda898a623	Merge `5bc6f636f7` into `daca208c0b`	2024-10-11 16:45:39 +09:00
Yves MOYROUD	5bc6f636f7	Update mount.py still a trailing whitespace	2024-10-04 09:08:03 +02:00
Yves MOYROUD	284025660c	delete trailing spaces in mount.py delete trailing spaces in comments in mount.py	2024-10-03 17:27:18 +02:00
Yves MOYROUD	f7f54f242d	Update mount.py suppressed erroneous remaining TOTO check	2024-10-03 13:32:42 +02:00
Yves MOYROUD	966df79767	Update mount.py new option keep_mountpoint enables keeping the mountpoint with state=absent	2024-10-03 11:36:45 +02:00
Yves MOYROUD	5ee818ec86	Update mount.py In function main(), remove rmdir in case if state == 'absent'. Unmounting a file system should not lead to delete anything that is revealed after unmounting. Also, it leads to an error if a non empty directory is present under the ex-mountpoint after umount : [Errno 39] Directory not empty So umount is successfull but the ansible run is failed. Of course, it is solved on second run.	2024-09-18 17:41:21 +02:00