← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/virt/libvirt/vif.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-09-25 10:54:59 UTC
  • mfrom: (1.1.63)
  • Revision ID: package-import@ubuntu.com-20120925105459-fr27butcb6p498gp
Tags: 2012.2~rc2-0ubuntu1
[ Adam Gandelman ]
* debian/control: Add python-cinderclient to python-nova Depends.
* wrap-and-sort.

[ Chuck Short ]
* debian/nova-common.postinst: Change root_helper to rootwrap_config
  when upgrading from precise
* debian/pydist-overrides: dont try to install babel.
* New upstream version.
* debian/rules: FTBFS if testsuite fails.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/libvirt/vif.py
212
212
        br_name = self.get_br_name(iface_id)
213
213
        v1_name, v2_name = self.get_veth_pair_names(iface_id)
214
214
 
215
 
        linux_net._create_veth_pair(v1_name, v2_name)
216
 
 
217
215
        if not linux_net._device_exists(br_name):
218
216
            utils.execute('brctl', 'addbr', br_name, run_as_root=True)
219
217
 
220
 
        utils.execute('ip', 'link', 'set', br_name, 'up', run_as_root=True)
221
 
        utils.execute('brctl', 'addif', br_name, v1_name, run_as_root=True)
222
 
        self.create_ovs_vif_port(v2_name, iface_id, mapping['mac'],
223
 
                                 instance['uuid'])
 
218
        if not linux_net._device_exists(v2_name):
 
219
            linux_net._create_veth_pair(v1_name, v2_name)
 
220
            utils.execute('ip', 'link', 'set', br_name, 'up', run_as_root=True)
 
221
            utils.execute('brctl', 'addif', br_name, v1_name, run_as_root=True)
 
222
            self.create_ovs_vif_port(v2_name, iface_id, mapping['mac'],
 
223
                                     instance['uuid'])
224
224
 
225
225
        network['bridge'] = br_name
226
226
        return self._get_configurations(instance, network, mapping)