[Ovirt-devel] [PATCH][server] Final network fixes

[Hugh O. Brock]

commit b2e5788e2b0945635f79578091757ac3cc826580
Author: Hugh O. Brock <hbrock at harpcolumn.com>
Date:   Fri Apr 3 18:53:42 2009 -0400

    Final two fixes for the network code. The hack in taskomatic.rb
    (adding "br" to the front of the network device we put in the VM config) should be fixed.

diff --git a/src/lib/managed_node_configuration.rb b/src/lib/managed_node_configuration.rb
index f93bccd..fac653b 100644
--- a/src/lib/managed_node_configuration.rb
+++ b/src/lib/managed_node_configuration.rb
@@ -110,7 +110,7 @@ class ManagedNodeConfiguration
     if bootproto == "static"
       entry += "|IPADDR=#{ipaddress}|NETMASK=#{netmask}|BROADCAST=#{broadcast}|GATEWAY=#{gateway}"
     end
-    entry += "|TYPE=bridge|PEERDNS=no|ONBOOT=yes"
+    entry += "|TYPE=Bridge|PEERDNS=no|ONBOOT=yes"
     result.puts entry
   end
 
diff --git a/src/task-omatic/taskomatic.rb b/src/task-omatic/taskomatic.rb
index df59e8d..f852c32 100755
--- a/src/task-omatic/taskomatic.rb
+++ b/src/task-omatic/taskomatic.rb
@@ -352,13 +352,13 @@ class TaskOmatic
          device = Nic.find(:first,
                            :conditions => ["host_id = ? AND physical_network_id = ?",
                                            db_host.id, db_vm.network_id ])
-         net_device = device.interface_name unless device.nil?
+         net_device = "br" + device.interface_name unless device.nil?
 
       else
          device = Bonding.find(:first,
                                :conditions => ["host_id = ? AND vlan_id = ?",
                                                db_host.id, db_vm.network_id])
-         net_device = device.interface_name unless device.nil?
+         net_device = "br" + device.interface_name unless device.nil?
       end
     end