← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/virt/vmwareapi/vif.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/virt/vmwareapi/vif.py
18
18
"""VIF drivers for VMWare."""
19
19
 
20
20
from nova import exception
21
 
from nova import flags
 
21
from nova.openstack.common import cfg
22
22
from nova.openstack.common import log as logging
23
23
from nova.virt import vif
24
24
from nova.virt.vmwareapi import network_utils
26
26
 
27
27
LOG = logging.getLogger(__name__)
28
28
 
29
 
FLAGS = flags.FLAGS
30
 
FLAGS.set_default('vmwareapi_vlan_interface', 'vmnic0')
 
29
CONF = cfg.CONF
 
30
CONF.set_default('vmwareapi_vlan_interface', 'vmnic0')
31
31
 
32
32
 
33
33
class VMWareVlanBridgeDriver(vif.VIFDriver):
44
44
        """Create a vlan and bridge unless they already exist."""
45
45
        vlan_num = network['vlan']
46
46
        bridge = network['bridge']
47
 
        vlan_interface = FLAGS.vmwareapi_vlan_interface
 
47
        vlan_interface = CONF.vmwareapi_vlan_interface
48
48
 
49
49
        # Check if the vlan_interface physical network adapter exists on the
50
50
        # host.