← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-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, Adam Gandleman
  • Date: 2012-02-03 09:03:12 UTC
  • mfrom: (1.1.43)
  • Revision ID: package-import@ubuntu.com-20120203090312-v0f0yt3tx1dfbd4r
Tags: 2012.1~e4~20120203.12454-0ubuntu1
https://launchpad.net/bugs/917851
https://launchpad.net/bugs/890362
https://launchpad.net/bugs/923817
[ Adam Gandelman ]
[Chuck Short]
* New upstream version.
* debian/control: Replace m2crpto with python-crypto.
  (LP: #917851)
* debian/*.upstart.in, debian/nova-common.postinst,
  debian/nova_sudoers: Change default shell to /bin/false.
  (LP: #890362)

[Adam Gandleman]
* debian/nova-common.{install, postinst}: Install policy.json on all
  Nova nodes (LP: #923817)
* debian/rules: Remove installation of policy.json (moved to nova-common),
  point to the correct upstream git repository.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/console/manager.py
19
19
 
20
20
import socket
21
21
 
 
22
from nova.common import cfg
22
23
from nova import exception
23
24
from nova import flags
24
25
from nova import log as logging
27
28
from nova import utils
28
29
 
29
30
 
 
31
console_manager_opts = [
 
32
    cfg.StrOpt('console_driver',
 
33
               default='nova.console.xvp.XVPConsoleProxy',
 
34
               help='Driver to use for the console proxy'),
 
35
    cfg.BoolOpt('stub_compute',
 
36
                default=False,
 
37
                help='Stub calls to compute worker for tests'),
 
38
    cfg.StrOpt('console_public_hostname',
 
39
               default=socket.gethostname(),
 
40
               help='Publicly visable name for this console host'),
 
41
    ]
 
42
 
30
43
FLAGS = flags.FLAGS
31
 
flags.DEFINE_string('console_driver',
32
 
                    'nova.console.xvp.XVPConsoleProxy',
33
 
                    'Driver to use for the console proxy')
34
 
flags.DEFINE_boolean('stub_compute', False,
35
 
                     'Stub calls to compute worker for tests')
36
 
flags.DEFINE_string('console_public_hostname',
37
 
                    socket.gethostname(),
38
 
                    'Publicly visable name for this console host')
 
44
FLAGS.add_options(console_manager_opts)
39
45
 
40
46
 
41
47
class ConsoleProxyManager(manager.Manager):