Merge "Use e1000 network driver in virtual labs" into stable/brahmaputra

[fuel.git] / deploy / templates / virtual_environment_noha / vms / controller.xml

diff --git a/deploy/templates/virtual_environment_noha/vms/controller.xml b/deploy/templates/virtual_environment_noha/vms/controller.xml
index 3ff2821..50950db 100644 (file)
--- a/deploy/templates/virtual_environment_noha/vms/controller.xml
+++ b/deploy/templates/virtual_environment_noha/vms/controller.xml
@@ -14,33 +14,6 @@
     <apic/>
     <pae/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>SandyBridge</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='dtes64'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='erms'/>
-    <feature policy='require' name='xtpr'/>
-    <feature policy='require' name='smep'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='est'/>
-    <feature policy='require' name='monitor'/>
-    <feature policy='require' name='smx'/>
-    <feature policy='require' name='tm'/>
-    <feature policy='require' name='acpi'/>
-    <feature policy='require' name='osxsave'/>
-    <feature policy='require' name='ht'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='fsgsbase'/>
-    <feature policy='require' name='f16c'/>
-    <feature policy='require' name='ds'/>
-    <feature policy='require' name='tm2'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='pbe'/>
-    <feature policy='require' name='ds_cpl'/>
-    <feature policy='require' name='rdrand'/>
-  </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>
   <on_reboot>restart</on_reboot>
@@ -57,19 +30,19 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <source network='fuel1'/>
-      <model type='virtio'/>
+      <model type='e1000'/>
     </interface>
     <interface type='network'>
       <source network='fuel2'/>
-      <model type='virtio'/>
+      <model type='e1000'/>
     </interface>
     <interface type='network'>
       <source network='fuel3'/>
-      <model type='virtio'/>
+      <model type='e1000'/>
     </interface>
     <interface type='network'>
       <source network='fuel4'/>
-      <model type='virtio'/>
+      <model type='e1000'/>
     </interface>
     <serial type='pty'>
       <target port='0'/>