Implement idempotency for server.modprobe & server.mount operations.

Author: Fizzadar

pyinfra/operations/server.py

@@ -249,10 +249,14 @@ def partition(predicate, iterable):
     # Module is loaded and we don't want it?
     if not present and present_mods:
         yield 'modprobe{0} -r -a {1}'.format(args, ' '.join(present_mods))
+        for mod in present_mods:
+            modules.pop(mod)
 
     # Module isn't loaded and we want it?
     elif present and missing_mods:
         yield 'modprobe{0} -a {1}'.format(args, ' '.join(missing_mods))
+        for mod in missing_mods:
+            modules[mod] = {}
 
     else:
         host.noop('{0} {1} {2} {3}'.format(
@@ -299,17 +303,20 @@ def mount(
             ' -o {0}'.format(options_string) if options_string else '',
             path,
         )
+        mounts[path] = {'options': options}
 
     # Want no mount but mounted?
     elif mounted is False and is_mounted:
         yield 'umount {0}'.format(path)
+        mounts.pop(path)
 
     # Want mount and is mounted! Check the options
     elif is_mounted and mounted and options:
         mounted_options = mounts[path]['options']
         needed_options = set(options) - set(mounted_options)
         if needed_options:
             yield 'mount -o remount,{0} {1}'.format(options_string, path)
+            mounts[path]['options'] = options
 
     else:
         host.noop('filesystem {0} is {1}'.format(

tests/operations/server.modprobe/add-list.json

@@ -7,6 +7,5 @@
     },
     "commands": [
         "modprobe -a mod1 mod3"
-    ],
-    "idempotent": false
+    ]
 }

tests/operations/server.modprobe/add.json

@@ -5,6 +5,5 @@
     },
     "commands": [
         "modprobe -a somemodule"
-    ],
-    "idempotent": false
+    ]
 }

tests/operations/server.modprobe/add_force.json

@@ -8,6 +8,5 @@
     },
     "commands": [
         "modprobe -f -a somemodule"
-    ],
-    "idempotent": false
+    ]
 }

tests/operations/server.modprobe/remove-list.json

@@ -10,6 +10,5 @@
     },
     "commands": [
         "modprobe -r -a mod1"
-    ],
-    "idempotent": false
+    ]
 }

tests/operations/server.modprobe/remove.json

@@ -10,6 +10,5 @@
     },
     "commands": [
         "modprobe -r -a somemodule"
-    ],
-    "idempotent": false
+    ]
 }

tests/operations/server.mount/mount.json

@@ -5,6 +5,5 @@
     },
     "commands": [
         "mount /data"
-    ],
-    "idempotent": false
+    ]
 }

tests/operations/server.mount/mount_options.json

@@ -8,6 +8,5 @@
     },
     "commands": [
         "mount -o rw /data"
-    ],
-    "idempotent": false
+    ]
 }

tests/operations/server.mount/remount_options.json

@@ -12,6 +12,5 @@
     },
     "commands": [
         "mount -o remount,rw,noatime /data"
-    ],
-    "idempotent": false
+    ]
 }

tests/operations/server.mount/unmount.json

@@ -10,6 +10,5 @@
     },
     "commands": [
         "umount /data"
-    ],
-    "idempotent": false
+    ]
 }