← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/network/linux_net.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Dave Walker (Daviey), Chuck Short
  • Date: 2012-02-17 10:59:59 UTC
  • mfrom: (1.1.45)
  • Revision ID: package-import@ubuntu.com-20120217105959-ut218n638vv7cre0
Tags: 2012.1~e4~20120217.12709-0ubuntu1
https://launchpad.net/bugs/929127
https://launchpad.net/bugs/923681
https://launchpad.net/bugs/932787
[ Dave Walker (Daviey) ]
* New upstream snapshot
* debian/patches/temp_fix_linux_net.patch:
  - Dropped, applied upstream. LP: #929127
* debian/patches/libvirt-use-console-pipe.patch:
  - Rebased against latest trunk

[ Chuck Short ]
* debian/nova.conf: Re-enable default iscsi_helper.
* debian/nova.conf: More fixups.
* debian/control: Dont depend and conflicts on nova-compute-
  hypervisor. (LP: #923681)
* debian/patches/libvirt-us-console-pipe.patch: Refreshed.
* Temporarily disable console patch. (LP: #932787)
* New usptream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/network/linux_net.py
32
32
from nova import utils
33
33
 
34
34
 
35
 
LOG = logging.getLogger("nova.linux_net")
 
35
LOG = logging.getLogger(__name__)
36
36
 
37
37
 
38
38
def _bin_file(script):
87
87
    ]
88
88
 
89
89
FLAGS = flags.FLAGS
90
 
FLAGS.add_options(linux_net_opts)
 
90
FLAGS.register_opts(linux_net_opts)
91
91
 
92
92
 
93
93
binary_name = os.path.basename(inspect.stack()[-1][1])