← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/virt/hyperv/volumeops.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/volumeops.py
21
21
import time
22
22
 
23
23
from nova import block_device
24
 
from nova import flags
25
24
from nova.openstack.common import cfg
26
25
from nova.openstack.common import log as logging
27
26
from nova.virt import driver
40
39
        help='The seconds to wait between an volume attachment attempt'),
41
40
    ]
42
41
 
43
 
FLAGS = flags.FLAGS
44
 
FLAGS.register_opts(hyper_volumeops_opts)
 
42
CONF = cfg.CONF
 
43
CONF.register_opts(hyper_volumeops_opts)
 
44
CONF.import_opt('my_ip', 'nova.config')
45
45
 
46
46
 
47
47
class VolumeOps(baseops.BaseOps):
59
59
        self._initiator = None
60
60
        self._default_root_device = 'vda'
61
61
        self._attaching_volume_retry_count = \
62
 
            FLAGS.hyperv_attaching_volume_retry_count
 
62
            CONF.hyperv_attaching_volume_retry_count
63
63
        self._wait_between_attach_retry = \
64
 
            FLAGS.hyperv_wait_between_attach_retry
 
64
            CONF.hyperv_wait_between_attach_retry
65
65
        self._volutils = volumeutils.VolumeUtils()
66
66
 
67
67
    def attach_boot_volume(self, block_device_info, vm_name):
207
207
                LOG.warn(_('Could not determine iscsi initiator name'),
208
208
                         instance=instance)
209
209
        return {
210
 
            'ip': FLAGS.my_ip,
 
210
            'ip': CONF.my_ip,
211
211
            'initiator': self._initiator,
212
212
        }
213
213