← Back to branch summary

~zulcss/nova/nova-precise-g3

« back to all changes in this revision

Viewing changes to nova/virt/netutils.py

  • Committer: Chuck Short
  • Date: 2013-02-25 12:48:57 UTC
  • mfrom: (94.1.5 raring-proposed)
  • Revision ID: zulcss@ubuntu.com-20130225124857-iiz7w0zqhjo1sbs3
https://launchpad.net/bugs/1110567
* New upstream release for the Ubuntu Cloud Archive. 
* 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.
* debian/control: Fix typo (websocikfy -> websockify).
* SECURITY UPDATE: fix lack of authentication on block device used for
  os-volume_boot
  - debian/patches/CVE-2013-0208.patch: adjust nova/compute/api.py to
    validate we can access the volumes
  - CVE-2013-0208

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/netutils.py
23
23
 
24
24
import netaddr
25
25
 
26
 
from nova.openstack.common import cfg
 
26
from oslo.config import cfg
27
27
 
28
28
CONF = cfg.CONF
29
 
CONF.import_opt('use_ipv6', 'nova.config')
 
29
CONF.import_opt('use_ipv6', 'nova.netconf')
30
30
CONF.import_opt('injected_network_template', 'nova.virt.disk.api')
31
31
 
32
32
Template = None