Merge pull request #22 from kushaldas/storage_size

Adds volume resize option

ansible_module/qubesos.py

@@ -151,6 +151,7 @@
          'default_dispvm': str,
          'netvm': str,
          'features': dict,
+         'volume': dict,
         }
 
 
@@ -396,6 +397,17 @@ def properties(self, vmname, prefs, vmtype, label, vmtemplate):
                     did_feature_changed = True
             if did_feature_changed:
                 values_changed.append("features")
+        if "volume" in prefs:
+            val = prefs["volume"]
+            # Let us get the volume
+            try:
+                volume = vm.volumes[val["name"]]
+                volume.resize(val["size"])
+            except Exception:
+                return VIRT_FAILED, {"Failure in updating volume": val}
+            changed = True
+            values_changed.append("volume")
+
         return changed, values_changed
 
 
@@ -458,7 +470,22 @@ def core(module):
                 # Also the vm should provide network
                 if not vm.provides_network:
                     return VIRT_FAILED, {"Missing netvm capability": val}
-                    template_for_dispvms
+
+            # Make sure volume has both name and value
+            if key == "volume":
+                if "name" not in val:
+                    return VIRT_FAILED, {"Missing name for the volume": val}
+                elif "size" not in val:
+                    return VIRT_FAILED, {"Missing size for the volume": val}
+
+                allowed_name = []
+                if vmtype == 'AppVM':
+                    allowed_name.append("private")
+                elif vmtype in ["StandAloneVM", "TemplateVM"]:
+                    allowed_name.append("root")
+
+                if not val["name"] in allowed_name:
+                    return VIRT_FAILED, {"Wrong volume name": val}
 
             # Make sure that the default_dispvm exists
             if key == "default_dispvm":

docs/examples.rst

@@ -89,6 +89,28 @@ Setting different property values to a given vm
 
 .. note:: Always remember to move the state to running to get the vm up and running.
 
+Resizing volume
+---------------
+
+This can be done using *volume* property. You can set the "private" volume size
+in AppVMs, and "root" volume size in StandAloneVM or TemplateVM. Right now it takes
+the size in bytes.
+
+::
+
+      tasks:
+    - name: Make sure the VM is present
+      qubesos:
+        guest: xchat2
+        state: present
+        properties:
+          memory: 1200
+          maxmem: 2400
+          netvm: 'sys-whonix'
+          label: "yellow"
+          volume:
+            name: "private"
+            size: "5368709120"
 
 Available properties
 ----------------------
@@ -110,6 +132,7 @@ The following are the different available properties and their data type.
 - 'default_dispvm': str
 - 'netvm': str
 - 'features': dict[str,str]
+- 'volume': dict[str,str]
 
 
 If you want to make changes to any existing vm, then first move it to *shutdown*

examples/presentstate.yaml

@@ -12,6 +12,9 @@
           maxmem: 2400
           netvm: 'sys-whonix'
           label: "yellow"
+          volume:
+            name: "private"
+            size: "5368709120"
 
     - name: Run the VM
       qubesos: