diff options
| author |   Stefan Berg <stefan.k.berg@ericsson.com> | 2016-01-29 13:31:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-29 13:31:08 +0000 |
| commit | 53bf12e7ee42e89a1c73665e5955cb9ce403614c (patch) | |
| tree | 6d1936959d4ecb576a0c1af8fa1a55bc73f193da /deploy/templates | |
| parent | da34b8fbba1d06db9ee62cc1e79af9c8a178eff6 (diff) | |
| parent | b11e7a6517908af048eff4388302b431260d0f24 (diff) | |
Merge "Use e1000 network driver in virtual labs" into stable/brahmaputra
Diffstat (limited to 'deploy/templates')
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'/> |