Changed xen.network -> xen.

[invirt/packages/invirt-xen-config.git] / invirt-database

diff --git a/invirt-database b/invirt-database
index 2c1ff7c..a0dc979 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -77,7 +77,6 @@ if codepath == 'hvm':
     kernel = '/usr/lib/xen/boot/hvmloader'
     builder = 'hvm'
     vnc = 1
     kernel = '/usr/lib/xen/boot/hvmloader'
     builder = 'hvm'
     vnc = 1

-    vncpasswd = 'moocow'

     device_model = '/usr/sbin/qemu-dm-invirt'
     serial = "pty"
 elif codepath == 'paravm':
     device_model = '/usr/sbin/qemu-dm-invirt'
     serial = "pty"
 elif codepath == 'paravm':

@@ -87,7 +86,7 @@ elif codepath == 'paravm':
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))
     d = ('%smac=%s, ip=%s, script=vif-invirtroute netdev=%s'
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))
     d = ('%smac=%s, ip=%s, script=vif-invirtroute netdev=%s'

-         % (viftype, n.mac_addr, n.ip, config.xen.network.iface))
+         % (viftype, n.mac_addr, n.ip, config.xen.iface))

     vif.append(d)
 
 for d in machine.disks:
     vif.append(d)
 
 for d in machine.disks: