utils.FileLock: Implement timeout

[ganeti-local] / lib / opcodes.py

diff --git a/lib/opcodes.py b/lib/opcodes.py
index c5062a3..2984185 100644 (file)
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -310,7 +310,7 @@ class OpCreateInstance(OpCode):
     "kernel_path", "initrd_path", "hvm_boot_order", "hvm_acpi",
     "hvm_pae", "hvm_cdrom_image_path", "vnc_bind_address",
     "file_storage_dir", "file_driver",
-    "iallocator",
+    "iallocator", "hvm_nic_type", "hvm_disk_type",
     ]
 
 
@@ -399,7 +399,8 @@ class OpSetInstanceParams(OpCode):
   __slots__ = [
     "instance_name", "mem", "vcpus", "ip", "bridge", "mac",
     "kernel_path", "initrd_path", "hvm_boot_order", "hvm_acpi",
-    "hvm_pae", "hvm_cdrom_image_path", "vnc_bind_address"
+    "hvm_pae", "hvm_cdrom_image_path", "vnc_bind_address",
+    "hvm_nic_type", "hvm_disk_type", "force"
     ]