← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/console/xvp.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2013-02-22 09:27:29 UTC
  • mfrom: (1.1.68)
  • Revision ID: package-import@ubuntu.com-20130222092729-nn3gt8rf97uvts77
Tags: 2013.1.g3-0ubuntu1
https://launchpad.net/bugs/1110567
[ Chuck Short ]
* New usptream release. 
* debian/patches/debian/patches/fix-ubuntu-tests.patch: Refreshed.
* debian/nova-baremetal.logrotate: Fix logfile path.
* debian/control, debian/nova-spiceproxy.{install, logrotate, upstart}:
  Add spice html5 proxy support.
* debian/nova-novncproxy.upstart: Start on runlevel [2345]
* debian/rules: Call testr directly since run_tests.sh -N gives weird return
  value when tests pass.
* debian/pyddist-overrides: Add websockify.
* debian/nova-common.postinst: Removed config file conversion, since
  the option is no longer available. (LP: #1110567)
* debian/control: Add python-pyasn1 as a dependency.
* debian/control: Add python-oslo-config as a dependency.
* debian/control: Suggest sysfsutils, sg3-utils, multipath-tools for fibre
  channel support.

[ Adam Gandelman ]
* debian/control: Fix typo (websocikfy -> websockify).

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/console/xvp.py
21
21
import signal
22
22
 
23
23
from Cheetah import Template
 
24
from oslo.config import cfg
24
25
 
25
26
from nova import context
26
27
from nova import db
27
28
from nova import exception
28
 
from nova.openstack.common import cfg
29
29
from nova.openstack.common import log as logging
30
30
from nova import paths
31
31
from nova import utils
51
51
 
52
52
CONF = cfg.CONF
53
53
CONF.register_opts(xvp_opts)
54
 
CONF.import_opt('host', 'nova.config')
 
54
CONF.import_opt('host', 'nova.netconf')
55
55
LOG = logging.getLogger(__name__)
56
56
 
57
57