← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/console/vmrc_manager.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/console/vmrc_manager.py
19
19
 
20
20
from nova.compute import rpcapi as compute_rpcapi
21
21
from nova import exception
22
 
from nova import flags
23
22
from nova import manager
24
23
from nova.openstack.common import cfg
25
24
from nova.openstack.common import importutils
29
28
 
30
29
LOG = logging.getLogger(__name__)
31
30
 
32
 
vmrc_manager_opts = [
33
 
    cfg.StrOpt('console_public_hostname',
34
 
               default='',
35
 
               help='Publicly visible name for this console host'),
36
 
    cfg.StrOpt('console_driver',
37
 
               default='nova.console.vmrc.VMRCConsole',
38
 
               help='Driver to use for the console'),
39
 
    ]
40
 
 
41
 
FLAGS = flags.FLAGS
42
 
FLAGS.register_opts(vmrc_manager_opts)
 
31
CONF = cfg.CONF
 
32
CONF.import_opt('console_driver', 'nova.console.manager')
 
33
CONF.import_opt('console_public_hostname', 'nova.console.manager')
43
34
 
44
35
 
45
36
class ConsoleVMRCManager(manager.Manager):
46
37
    """Manager to handle VMRC connections for accessing instance consoles."""
47
38
 
48
39
    def __init__(self, console_driver=None, *args, **kwargs):
49
 
        self.driver = importutils.import_object(FLAGS.console_driver)
 
40
        self.driver = importutils.import_object(CONF.console_driver)
50
41
        self.compute_rpcapi = compute_rpcapi.ComputeAPI()
51
42
        super(ConsoleVMRCManager, self).__init__(*args, **kwargs)
52
43
 
62
53
                    pool['address'],
63
54
                    pool['username'],
64
55
                    pool['password'],
65
 
                    FLAGS.console_vmrc_error_retries)
 
56
                    CONF.console_vmrc_error_retries)
66
57
            self.sessions[pool['id']] = vim_session
67
58
        return self.sessions[pool['id']]
68
59
 
145
136
            pool_info['host'] = self.host
146
137
            # ESX Address or Proxy Address
147
138
            public_host_name = pool_info['address']
148
 
            if FLAGS.console_public_hostname:
149
 
                public_host_name = FLAGS.console_public_hostname
 
139
            if CONF.console_public_hostname:
 
140
                public_host_name = CONF.console_public_hostname
150
141
            pool_info['public_hostname'] = public_host_name
151
142
            pool_info['console_type'] = console_type
152
143
            pool_info['compute_host'] = instance_host