shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-27 14:03:40 +03:00
Code Releases Wiki Activity

bug #3887: send BRIDGE_OVS to attach nic for OVS hosts

Browse Source
This commit is contained in:
Javi Fontan 2015-09-16 14:59:34 +02:00
parent d01fe56999
commit 0d51a96d1f
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vmm_mad/exec/one_vmm_exec.rb
View File

@ -795,9 +795,12 @@ class ExecDriver < VirtualMachineDriver
begin
source = xml_data.elements["VM/TEMPLATE/NIC[ATTACH='YES']/BRIDGE"]
source_ovs =
xml_data.elements["VM/TEMPLATE/NIC[ATTACH='YES']/BRIDGE_OVS"]
mac = xml_data.elements["VM/TEMPLATE/NIC[ATTACH='YES']/MAC"]
source = source.text.strip
source_ovs = source_ovs.text.strip if source_ovs
mac = mac.text.strip
rescue
send_message(action, RESULT[:failure], id,
@ -818,6 +821,8 @@ class ExecDriver < VirtualMachineDriver
net_drv = net_drv.strip if !net_drv.nil?
net_drv = "-" if net_drv.nil?
source = source_ovs if net_drv == 'ovswitch' && source_ovs
action = VmmAction.new(self, id, :attach_nic, drv_message)
steps=[