← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/virt/hyperv/snapshotops.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/hyperv/snapshotops.py
23
23
import sys
24
24
 
25
25
from nova import exception
26
 
from nova import flags
27
26
from nova.image import glance
 
27
from nova.openstack.common import cfg
28
28
from nova.openstack.common import log as logging
29
29
from nova.virt.hyperv import baseops
30
30
from nova.virt.hyperv import constants
36
36
if sys.platform == 'win32':
37
37
    import wmi
38
38
 
39
 
FLAGS = flags.FLAGS
 
39
CONF = cfg.CONF
40
40
LOG = logging.getLogger(__name__)
41
41
 
42
42
 
75
75
        f = None
76
76
 
77
77
        try:
78
 
            src_vhd_path = os.path.join(FLAGS.instances_path, instance_name,
 
78
            src_vhd_path = os.path.join(CONF.instances_path, instance_name,
79
79
                instance_name + ".vhd")
80
80
 
81
81
            image_man_svc = self._conn.Msvm_ImageManagementService()[0]