summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-18 17:31:12 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-07-18 17:31:52 +0200
commit4532c1df3f22a4d69b56e3956dcccf0a9d3ad258 (patch)
tree4536610037fb18c3d4146c353567d82bfa4a9286 /patches/opnfv-fuel
parent7b47bc53348e37927e4459ea6aed6d2327c87aeb (diff)
p/fuel: Rebase after --noautoconsole got upstream
Change-Id: I99b6052a26169888c137f874889872107c7df931 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r--patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch2
-rw-r--r--patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch12
-rw-r--r--patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch7
3 files changed, 11 insertions, 10 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch b/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
index 24c23649..48981c3c 100644
--- a/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
+++ b/patches/opnfv-fuel/0001-mcp-config-AArch64-Use-UEFI-arm64-image.patch
@@ -26,7 +26,7 @@ index b841e88..17fbbfc 100644
ram: 4096
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index fb3fc99..d56049c 100644
+index 679b997..af57dcc 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -18,7 +18,7 @@ cleanup_vms() {
diff --git a/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch b/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch
index c9b2f4d9..8c6e8f57 100644
--- a/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch
+++ b/patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch
@@ -35,7 +35,7 @@ index a1f5e38..92c7947 100755
# Check scenario file existence
if [[ ! -f ../config/${DEPLOY_SCENARIO}.yaml ]]; then
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index d56049c..4df1a5b 100644
+index af57dcc..245a8f4 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -56,6 +56,13 @@ create_vms() {
@@ -46,18 +46,18 @@ index d56049c..4df1a5b 100644
+ local virt_extra_args=""
+ if [ "$(uname -i)" = "aarch64" ]; then
+ # No Cirrus VGA on AArch64, use vga std
-+ virt_extra_args="$virt_extra_args --video=vga --noautoconsole"
++ virt_extra_args="$virt_extra_args --video=vga"
+ fi
+
# create vms with specified options
for node in "${vnodes[@]}"; do
virt-install --name ${node} --ram ${vnodes_ram[$node]} --vcpus ${vnodes_vcpus[$node]} --cpu host --accelerate \
-@@ -66,7 +73,8 @@ create_vms() {
- --disk path=$(pwd)/images/mcp_${node}.qcow2,format=qcow2,bus=virtio,cache=none,io=native \
+@@ -67,7 +74,8 @@ create_vms() {
--os-type linux --os-variant none \
--boot hd --vnc --console pty --autostart --noreboot \
-- --disk path=$(pwd)/images/mcp_${node}.iso,device=cdrom
-+ --disk path=$(pwd)/images/mcp_${node}.iso,device=cdrom \
+ --disk path=$(pwd)/images/mcp_${node}.iso,device=cdrom \
+- --noautoconsole
++ --noautoconsole \
+ ${virt_extra_args}
done
}
diff --git a/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch b/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch
index add5318f..6c32aa14 100644
--- a/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch
+++ b/patches/opnfv-fuel/0003-lib.sh-AArch64-virt-install-Use-virtio-net-pci.patch
@@ -34,10 +34,10 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
-index 4df1a5b..d4869c6 100644
+index 245a8f4..5fcecbd 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
-@@ -58,23 +58,35 @@ create_vms() {
+@@ -58,24 +58,36 @@ create_vms() {
# AArch64: prepare arch specific arguments
local virt_extra_args=""
@@ -45,7 +45,7 @@ index 4df1a5b..d4869c6 100644
+ local virt_net_model="${virt_pxe_net_model}"
if [ "$(uname -i)" = "aarch64" ]; then
# No Cirrus VGA on AArch64, use vga std
- virt_extra_args="$virt_extra_args --video=vga --noautoconsole"
+ virt_extra_args="$virt_extra_args --video=vga"
+ # AArch64 networking defaults to virtio-mmio before libvirt 3.x
+ virt_net_model="virtio-net-pci"
fi
@@ -65,6 +65,7 @@ index 4df1a5b..d4869c6 100644
--os-type linux --os-variant none \
--boot hd --vnc --console pty --autostart --noreboot \
--disk path=$(pwd)/images/mcp_${node}.iso,device=cdrom \
+ --noautoconsole \
${virt_extra_args}
+
+ # NOTE(armband): Disable legacy virtio (0.9) in favor of modern virtio (1.0)