Updated email in Authors

3 files changed, 11 insertions, 12 deletions

diff --git a/.mailmap b/.mailmap
index a839eba6c..d479bfdf2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,6 +19,7 @@
 <jmckenty@gmail.com> <jmckenty@joshua-mckentys-macbook-pro.local>
 <jmckenty@gmail.com> <jmckenty@yyj-dhcp171.corp.flock.com>
 <jmckenty@gmail.com> <joshua.mckenty@nasa.gov>
+<josh@jk0.org> <josh.kearney@rackspace.com>
 <justin@fathomdb.com> <justinsb@justinsb-desktop>
 <justin@fathomdb.com> <superstack@superstack.org>
 <masumotok@nttdata.co.jp> Masumoto<masumotok@nttdata.co.jp>
diff --git a/Authors b/Authors
index 494e614a0..39241b45c 100644
--- a/Authors
+++ b/Authors
@@ -31,7 +31,7 @@ John Dewey <john@dewey.ws>
 Jonathan Bryce <jbryce@jbryce.com>
 Jordan Rinke <jordan@openstack.org>
 Josh Durgin <joshd@hq.newdream.net>
-Josh Kearney <josh.kearney@rackspace.com>
+Josh Kearney <josh@jk0.org>
 Joshua McKenty <jmckenty@gmail.com>
 Justin Santa Barbara <justin@fathomdb.com>
 Kei Masumoto <masumotok@nttdata.co.jp>
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 7bffd8c6c..a47d23f88 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -476,19 +476,15 @@ class VMOps(object):
     def rescue(self, instance, callback):
         """Rescue the specified instance"""
         vm = self._get_vm_opaque_ref(instance)
-
         self._shutdown(instance, vm)
+
+        # Temporary instance
         target_vm = VMHelper.lookup(self._session, "instance-00000001")
-        #target_vm = self.compute_api.create(
-        #    context=context.get_admin_context(),
-        #    instance_type="m1.tiny",
-        #    image_id=1,
-        #    kernel_id=3,
-        #    ramdisk_id=2,
-        #    display_name="test",
-        #    display_description="test")
-        #print context.get_admin_context().__dict__
-        #print target_vm
+
+        # Plan of action
+        # Create `instance` object for rescue_vm
+        # rescue_instance = self._make_rescue_instance() # Write this
+        #rescue_vm = self.spawn(instance)
 
         vbd = self._session.get_xenapi().VM.get_VBDs(vm)[0]
         vdi_ref = self._session.get_xenapi().VBD.get_record(vbd)["VDI"]
@@ -505,6 +501,8 @@ class VMOps(object):
     def unrescue(self, instance, callback):
         """Unrescue the specified instance"""
         vm = self._get_vm_opaque_ref(instance)
+
+        # Temporary instance
         target_vm = VMHelper.lookup(self._session, "instance-00000001")
 
         vbds = self._session.get_xenapi().VM.get_VBDs(target_vm)