Fix idempotency for storages configured with no content

Author: lae

library/proxmox_storage.py

@@ -218,7 +218,11 @@ def prepare_storage_args(self):
         args = {}
 
         args['type'] = self.type
-        args['content'] = ','.join(self.content)
+        if self.content is not None and len(self.content) > 0:
+            args['content'] = ','.join(self.content)
+        else:
+            # PVE uses "none" to represent when no content types are selected
+            args['content'] = 'none'
         if self.nodes is not None:
             args['nodes'] = ','.join(self.nodes)
         if self.disable is not None:
@@ -273,7 +277,8 @@ def modify_storage(self):
 
         for key in new_storage:
             if key == 'content':
-                if set(self.content) != set(lookup.get('content', '').split(',')):
+                if set(new_storage['content'].split(',')) \
+                        != set(lookup.get('content', '').split(',')):
                     updated_fields.append(key)
                     staged_storage[key] = new_storage[key]
             elif key == 'monhost':

tests/vagrant/group_vars/all

@@ -63,6 +63,9 @@ pve_storages:
     disable: yes
     content: [ "images" ]
     path: /tmp/fakedir
+  - name: no-content-dir
+    type: dir
+    path: /tmp/fakedir2
 pve_zfs_create_volumes:
   - testpool/zfs2
 pve_ceph_osds: