← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/virt/hyperv.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandleman
  • Date: 2012-01-13 09:51:10 UTC
  • mfrom: (1.1.40)
  • Revision ID: package-import@ubuntu.com-20120113095110-ffd6163drcg77wez
Tags: 2012.1~e3~20120113.12049-0ubuntu1
https://launchpad.net/bugs/681774
https://launchpad.net/bugs/91379
https://launchpad.net/bugs/907543
[Chuck Short]
* New upstream version.
* debian/nova_sudoers, debian/nova-common.install, 
  Switch out to nova-rootwrap. (LP: #681774)
* Add "get-origsource-git" which allows developers to 
  generate a tarball from github, by doing:
  fakeroot debian/rules get-orig-source-git
* debian/debian/nova-objectstore.logrotate: Dont determine
  if we are running Debian or Ubuntu. (LP: #91379)

[Adam Gandleman]
* Removed python-nova.postinst, let dh_python2 generate instead since
  python-support is not a dependency. (LP: #907543)

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/hyperv.py
63
63
import os
64
64
import time
65
65
 
 
66
from nova.compute import power_state
66
67
from nova import exception
67
68
from nova import flags
68
69
from nova import log as logging
69
 
from nova.compute import power_state
70
70
from nova.virt import driver
71
71
from nova.virt import images
72
72
 
374
374
            raise exception.InstanceNotFound(instance_id=instance.id)
375
375
        self._set_vm_state(instance.name, 'Reboot')
376
376
 
377
 
    def destroy(self, instance, network_info, block_device_info=None,
378
 
                cleanup=True):
 
377
    def destroy(self, instance, network_info, block_device_info=None):
379
378
        """Destroy the VM. Also destroy the associated VHD disk files"""
380
379
        LOG.debug(_("Got request to destroy vm %s"), instance.name)
381
380
        vm = self._lookup(instance.name)