← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/console/vmrc_manager.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/console/vmrc_manager.py
22
22
from nova import log as logging
23
23
from nova import manager
24
24
from nova.openstack.common import cfg
 
25
from nova.openstack.common import importutils
25
26
from nova import rpc
26
 
from nova import utils
27
27
from nova.virt import vmwareapi_conn
28
28
 
29
29
 
46
46
    """Manager to handle VMRC connections for accessing instance consoles."""
47
47
 
48
48
    def __init__(self, console_driver=None, *args, **kwargs):
49
 
        self.driver = utils.import_object(FLAGS.console_driver)
 
49
        self.driver = importutils.import_object(FLAGS.console_driver)
50
50
        super(ConsoleVMRCManager, self).__init__(*args, **kwargs)
51
51
 
52
52
    def init_host(self):