allow delection when task errored and no longer set instance boot order

sandwichcloud · Jan 27, 2018 · df4a891 · df4a891
1 parent 7bb903b
commit df4a891
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/deli/counter/http/mounts/root/routes/v1/instance.py b/deli/counter/http/mounts/root/routes/v1/instance.py
@@ -210,7 +210,7 @@ def delete(self, **_):
         cherrypy.response.status = 204
 
         instance: Instance = cherrypy.request.resource_object
-        if instance.task is not None:
+        if instance.task is not None and instance.state != ResourceState.Error:
             raise cherrypy.HTTPError(400, "Please wait for the current task to finish.")
         if instance.state == ResourceState.ToDelete or instance.state == ResourceState.Deleting:
             raise cherrypy.HTTPError(400, "Instance is already being deleting")

diff --git a/deli/counter/http/mounts/root/routes/v1/volume.py b/deli/counter/http/mounts/root/routes/v1/volume.py
@@ -93,7 +93,7 @@ def delete(self, **_):
         cherrypy.response.status = 204
 
         volume: Volume = cherrypy.request.resource_object
-        if volume.task is not None:
+        if volume.task is not None and volume.state != ResourceState.Error:
             raise cherrypy.HTTPError(400, "Please wait for the current task to finish.")
         if volume.state == ResourceState.ToDelete or volume.state == ResourceState.Deleting:
             raise cherrypy.HTTPError(400, "Volume is already being deleting")

diff --git a/deli/manager/vmware.py b/deli/manager/vmware.py
@@ -125,16 +125,10 @@ def create_vm_from_image(self, vm_name, image, cluster, datastore, folder, port_
         nic.device.connectable.allowGuestControl = True
 
         vmconf = vim.vm.ConfigSpec()
-        vmconf.numCPUs = vcpus  # TODO: allow customization of these
+        vmconf.numCPUs = vcpus
         vmconf.memoryMB = ram
         vmconf.deviceChange = [nic]
 
-        vmconf.bootOptions = vim.vm.BootOptions()
-        # Set the boot device to the first disk just in-case it was set to something else
-        boot_disk_device = vim.vm.BootOptions.BootableDiskDevice()
-        boot_disk_device.deviceKey = 2000
-        vmconf.bootOptions.bootOrder = [boot_disk_device]
-
         enable_uuid_opt = vim.option.OptionValue()
         enable_uuid_opt.key = 'disk.enableUUID'  # Allow the guest to easily mount extra disks
         enable_uuid_opt.value = '1'