aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/templates
diff options
context:
space:
mode:
authorMichal Skalski <mskalski@mirantis.com>2016-01-26 11:10:34 +0100
committerStefan Berg <sfb@consultron.com>2016-01-29 14:25:58 +0100
commitb11e7a6517908af048eff4388302b431260d0f24 (patch)
treea503ca44655a183580f8f07f61ffce850d285b89 /deploy/templates
parent19f52239658b8e8b905acf4e8613db51f8d03e02 (diff)
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> (cherry picked from commit 4b87e1e902e44971740ca020b164327d463d12c8)
Diffstat (limited to 'deploy/templates')
-rw-r--r--deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml8
-rw-r--r--deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml8
-rw-r--r--deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml2
-rw-r--r--deploy/templates/intel/virtual_environment/noha/vms/compute.xml8
-rw-r--r--deploy/templates/intel/virtual_environment/noha/vms/controller.xml8
-rw-r--r--deploy/templates/intel/virtual_environment/noha/vms/fuel.xml2
-rw-r--r--deploy/templates/virtual_environment/vms/compute.xml8
-rw-r--r--deploy/templates/virtual_environment/vms/controller.xml8
-rw-r--r--deploy/templates/virtual_environment/vms/fuel.xml2
-rw-r--r--deploy/templates/virtual_environment_noha/vms/compute.xml8
-rw-r--r--deploy/templates/virtual_environment_noha/vms/controller.xml8
-rw-r--r--deploy/templates/virtual_environment_noha/vms/fuel.xml2
12 files changed, 36 insertions, 36 deletions
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'/>