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 fbef4bd..063b23d 100644 (file)
--- 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 3ff2821..d30a95d 100644 (file)
--- 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 1a32860..a693c96 100644 (file)
--- 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 fbef4bd..063b23d 100644 (file)
--- 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 3ff2821..d30a95d 100644 (file)
--- 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 1a32860..a693c96 100644 (file)
--- 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 cc60a2a..fa4ef5d 100644 (file)
--- 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 0a4b693..50950db 100644 (file)
--- 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 a9177f3..4e7c7fd 100644 (file)
--- 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 cc60a2a..fa4ef5d 100644 (file)
--- 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 0a4b693..50950db 100644 (file)
--- 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 a9177f3..4e7c7fd 100644 (file)
--- 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'/>