From 0f678085fed5e10417cc95e0d84293f2cc1e2c78 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Thu, 1 Nov 2012 22:13:49 +0000
Subject: xenapi: place boot lock when doing soft delete

If an instance is soft deleted a boot lock should be placed to ensure
it doesn't get restarted by accident.

Change-Id: Id46b8758f71d122d2a9cf7ae172fc138974bc315
---
 nova/virt/xenapi/vmops.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 2c594e589..ee0ed10b6 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -1146,10 +1146,12 @@ class VMOps(object):
                         instance=instance)
         else:
             vm_utils.shutdown_vm(self._session, instance, vm_ref, hard=True)
+            self._acquire_bootlock(vm_ref)
 
     def restore(self, instance):
         """Restore the specified instance."""
         vm_ref = self._get_vm_opaque_ref(instance)
+        self._release_bootlock(vm_ref)
         self._start(instance, vm_ref)
 
     def power_off(self, instance):
-- 
cgit