From: Michal Skalski <mskalski@mirantis.com>
Date: Tue, 26 Jan 2016 10:10:34 +0000 (+0100)
Subject: Use e1000 network driver in virtual labs
X-Git-Tag: colorado.1.rc1~257
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4b87e1e902e44971740ca020b164327d463d12c8;p=fuel.git

Use e1000 network driver in virtual labs

In the past virtio network driver cause problems when vlan segmentation
was used [1][2]. E1000 driver looks like safer choice.

[1] https://bugs.launchpad.net/fuel/+bug/1433593
[2] https://bugs.launchpad.net/fuel/+bug/1463316

Change-Id: I0a573e640309ad3caf2d67166cdaeaf285a6e6be
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
---

diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml
index fbef4bda7..063b23d98 100644
--- a/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml
+++ b/deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml
@@ -57,19 +57,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'/>
diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml
index 3ff28218d..d30a95dcf 100644
--- a/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml
+++ b/deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml
@@ -57,19 +57,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'/>
diff --git a/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml b/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml
index 1a3286001..a693c96f9 100644
--- a/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml
+++ b/deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml
@@ -67,7 +67,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <source network='fuel1'/>
-      <model type='virtio'/>
+      <model type='e1000'/>
     </interface>
     <serial type='pty'>
       <target port='0'/>
diff --git a/deploy/templates/intel/virtual_environment/noha/vms/compute.xml b/deploy/templates/intel/virtual_environment/noha/vms/compute.xml
index fbef4bda7..063b23d98 100644
--- a/deploy/templates/intel/virtual_environment/noha/vms/compute.xml
+++ b/deploy/templates/intel/virtual_environment/noha/vms/compute.xml
@@ -57,19 +57,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'/>
diff --git a/deploy/templates/intel/virtual_environment/noha/vms/controller.xml b/deploy/templates/intel/virtual_environment/noha/vms/controller.xml
index 3ff28218d..d30a95dcf 100644
--- a/deploy/templates/intel/virtual_environment/noha/vms/controller.xml
+++ b/deploy/templates/intel/virtual_environment/noha/vms/controller.xml
@@ -57,19 +57,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'/>
diff --git a/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml b/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml
index 1a3286001..a693c96f9 100644
--- a/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml
+++ b/deploy/templates/intel/virtual_environment/noha/vms/fuel.xml
@@ -67,7 +67,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <source network='fuel1'/>
-      <model type='virtio'/>
+      <model type='e1000'/>
     </interface>
     <serial type='pty'>
       <target port='0'/>
diff --git a/deploy/templates/virtual_environment/vms/compute.xml b/deploy/templates/virtual_environment/vms/compute.xml
index cc60a2ad2..fa4ef5d8d 100644
--- a/deploy/templates/virtual_environment/vms/compute.xml
+++ b/deploy/templates/virtual_environment/vms/compute.xml
@@ -30,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'/>
diff --git a/deploy/templates/virtual_environment/vms/controller.xml b/deploy/templates/virtual_environment/vms/controller.xml
index 0a4b6937c..50950db17 100644
--- a/deploy/templates/virtual_environment/vms/controller.xml
+++ b/deploy/templates/virtual_environment/vms/controller.xml
@@ -30,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'/>
diff --git a/deploy/templates/virtual_environment/vms/fuel.xml b/deploy/templates/virtual_environment/vms/fuel.xml
index a9177f311..4e7c7fd2a 100644
--- a/deploy/templates/virtual_environment/vms/fuel.xml
+++ b/deploy/templates/virtual_environment/vms/fuel.xml
@@ -40,7 +40,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <source network='fuel1'/>
-      <model type='virtio'/>
+      <model type='e1000'/>
     </interface>
     <serial type='pty'>
       <target port='0'/>
diff --git a/deploy/templates/virtual_environment_noha/vms/compute.xml b/deploy/templates/virtual_environment_noha/vms/compute.xml
index cc60a2ad2..fa4ef5d8d 100644
--- a/deploy/templates/virtual_environment_noha/vms/compute.xml
+++ b/deploy/templates/virtual_environment_noha/vms/compute.xml
@@ -30,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'/>
diff --git a/deploy/templates/virtual_environment_noha/vms/controller.xml b/deploy/templates/virtual_environment_noha/vms/controller.xml
index 0a4b6937c..50950db17 100644
--- a/deploy/templates/virtual_environment_noha/vms/controller.xml
+++ b/deploy/templates/virtual_environment_noha/vms/controller.xml
@@ -30,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'/>
diff --git a/deploy/templates/virtual_environment_noha/vms/fuel.xml b/deploy/templates/virtual_environment_noha/vms/fuel.xml
index a9177f311..4e7c7fd2a 100644
--- a/deploy/templates/virtual_environment_noha/vms/fuel.xml
+++ b/deploy/templates/virtual_environment_noha/vms/fuel.xml
@@ -40,7 +40,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <interface type='network'>
       <source network='fuel1'/>
-      <model type='virtio'/>
+      <model type='e1000'/>
     </interface>
     <serial type='pty'>
       <target port='0'/>