Aligning machine type over Ubuntu and Centos 29/16729/1
authorStefan K. Berg <stefan.k.berg@ericsson.com>
Tue, 12 Jul 2016 08:54:17 +0000 (10:54 +0200)
committerStefan K. Berg <stefan.k.berg@ericsson.com>
Tue, 12 Jul 2016 08:58:45 +0000 (10:58 +0200)
commitd4ae056501ed0778a19beb6f207c00439f95cff3
treefecc6fe1ca0b7938ce50213b9add576b5c75f105
parentf7f13befab5bf9a585f4f24018fd9561ed61b1ae
Aligning machine type over Ubuntu and Centos

We have previously used "pc-1.0" as the qemu-kvm machine definition
for virtual Fuel deploys. On Ubuntu this points to:

pc-1.0               Standard PC (i440FX + PIIX, 1996)

On CentOS 7 this machine definition does not exist, but there's a
match in "pc":

pc                   RHEL 7.0.0 PC (i440FX + PIIX, 1996) (alias of
pc-i440fx-rhel7.0.0

So, finally, pc is also in Ubuntu:

pc                   Ubuntu 14.04 PC (i440FX + PIIX, 1996) (alias of
pc-i440fx-trusty)

This change is about exploring whether moving to "pc" will make the
auto deploy work on both platforms with the "pc" machine type.

What still needs to be done in CentOS is to create a symlink from
/usr/libexec/qemu-kvm and /usr/bin/kvm though.

Change-Id: I1cce52a21075950cb59b75709b12d724d759e3e6
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
12 files changed:
deploy/templates/ericsson/virtual_environment/noha/vms/compute.xml
deploy/templates/ericsson/virtual_environment/noha/vms/controller.xml
deploy/templates/ericsson/virtual_environment/noha/vms/fuel.xml
deploy/templates/intel/virtual_environment/noha/vms/compute.xml
deploy/templates/intel/virtual_environment/noha/vms/controller.xml
deploy/templates/intel/virtual_environment/noha/vms/fuel.xml
deploy/templates/virtual_environment/vms/compute.xml
deploy/templates/virtual_environment/vms/controller.xml
deploy/templates/virtual_environment/vms/fuel.xml
deploy/templates/virtual_environment_noha/vms/compute.xml
deploy/templates/virtual_environment_noha/vms/controller.xml
deploy/templates/virtual_environment_noha/vms/fuel.xml