← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/console/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/manager.py
21
21
 
22
22
from nova.compute import rpcapi as compute_rpcapi
23
23
from nova import exception
24
 
from nova import flags
25
24
from nova import manager
26
25
from nova.openstack.common import cfg
27
26
from nova.openstack.common import importutils
37
36
                default=False,
38
37
                help='Stub calls to compute worker for tests'),
39
38
    cfg.StrOpt('console_public_hostname',
40
 
               default=socket.gethostname(),
 
39
               default=socket.getfqdn(),
41
40
               help='Publicly visible name for this console host'),
42
41
    ]
43
42
 
44
 
FLAGS = flags.FLAGS
45
 
FLAGS.register_opts(console_manager_opts)
 
43
CONF = cfg.CONF
 
44
CONF.register_opts(console_manager_opts)
46
45
LOG = logging.getLogger(__name__)
47
46
 
48
47
 
57
56
 
58
57
    def __init__(self, console_driver=None, *args, **kwargs):
59
58
        if not console_driver:
60
 
            console_driver = FLAGS.console_driver
 
59
            console_driver = CONF.console_driver
61
60
        self.driver = importutils.import_object(console_driver)
62
61
        super(ConsoleProxyManager, self).__init__(*args, **kwargs)
63
62
        self.driver.host = self.host
118
117
            #NOTE(mdragon): Right now, the only place this info exists is the
119
118
            #               compute worker's flagfile, at least for
120
119
            #               xenserver. Thus we ned to ask.
121
 
            if FLAGS.stub_compute:
 
120
            if CONF.stub_compute:
122
121
                pool_info = {'address': '127.0.0.1',
123
122
                             'username': 'test',
124
123
                             'password': '1234pass'}
128
127
            pool_info['password'] = self.driver.fix_pool_password(
129
128
                                                    pool_info['password'])
130
129
            pool_info['host'] = self.host
131
 
            pool_info['public_hostname'] = FLAGS.console_public_hostname
 
130
            pool_info['public_hostname'] = CONF.console_public_hostname
132
131
            pool_info['console_type'] = self.driver.console_type
133
132
            pool_info['compute_host'] = instance_host
134
133
            pool = self.db.console_pool_create(context, pool_info)