From 738f6c3b68d1179de1ff790f9e72c25f10874da4 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 29 Jan 2018 02:46:13 +0100
Subject: [FN VMs] remove graphics
Since VCP VMs (created via salt formula) do not have a video
controller defined in their domain XMLs, network devices end on
different PCI slots and hence have different names assigned
(ens2+ vs foundation node VMs, which start with ens3).
To align network interface names for VMs on jumpserver vs kvm nodes,
and reduce confusion, remove the video controller from FN VMs.
This allows some cleanup:
- drop extra AArch64 args from virt-install;
- unify 'opnfv_vcp_vm_*' and 'opnfv_fn_vm_*' variables;
Change-Id: I0d108b00914b3eaaa03b67c652174f8ed4573118
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
mcp/scripts/lib.sh | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
(limited to 'mcp/scripts')
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index d2ffaa659..2038badfd 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -336,13 +336,6 @@ function create_vms {
IFS='|' read -r -a vnodes <<< "$1"; shift
local vnode_networks=("$@")
- # AArch64: prepare arch specific arguments
- local virt_extra_args=""
- if [ "$(uname -i)" = "aarch64" ]; then
- # No Cirrus VGA on AArch64, use virtio instead
- virt_extra_args="$virt_extra_args --video=virtio"
- fi
-
# create vms with specified options
for serialized_vnode_data in "${vnodes[@]}"; do
IFS=',' read -r -a vnode_data <<< "${serialized_vnode_data}"
@@ -363,10 +356,9 @@ function create_vms {
--cpu host-passthrough --accelerate ${net_args} \
--disk path="${image_dir}/mcp_${vnode_data[0]}.qcow2",format=qcow2,bus=virtio,cache=none,io=native \
--os-type linux --os-variant none \
- --boot hd --vnc --console pty --autostart --noreboot \
+ --boot hd --nographics --console pty --autostart --noreboot \
--disk path="${image_dir}/mcp_${vnode_data[0]}.iso",device=cdrom \
- --noautoconsole \
- ${virt_extra_args}
+ --noautoconsole
done
}
--
cgit