← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/virt/vmwareapi/vmops.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/vmwareapi/vmops.py
28
28
 
29
29
from nova.compute import power_state
30
30
from nova import exception
31
 
from nova import flags
32
31
from nova.openstack.common import cfg
33
32
from nova.openstack.common import importutils
34
33
from nova.openstack.common import log as logging
42
41
        default='nova.virt.vmwareapi.vif.VMWareVlanBridgeDriver',
43
42
        help='The VMWare VIF driver to configure the VIFs.')
44
43
 
45
 
FLAGS = flags.FLAGS
46
 
FLAGS.register_opt(vmware_vif_driver_opt)
 
44
CONF = cfg.CONF
 
45
CONF.register_opt(vmware_vif_driver_opt)
47
46
 
48
47
LOG = logging.getLogger(__name__)
49
48
 
59
58
    def __init__(self, session):
60
59
        """Initializer."""
61
60
        self._session = session
62
 
        self._vif_driver = importutils.import_object(FLAGS.vmware_vif_driver)
 
61
        self._vif_driver = importutils.import_object(CONF.vmware_vif_driver)
63
62
 
64
63
    def list_instances(self):
65
64
        """Lists the VM instances that are registered with the ESX host."""
207
206
 
208
207
        # Set the machine.id parameter of the instance to inject
209
208
        # the NIC configuration inside the VM
210
 
        if FLAGS.flat_injected:
 
209
        if CONF.flat_injected:
211
210
            self._set_machine_id(client_factory, instance, network_info)
212
211
 
213
212
        # Naming the VM files in correspondence with the VM instance name