From de0b0f160f6ac408c2ba302507ede4d0a537b73f Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 10 Jul 2017 17:32:57 +0200 Subject: MCP: patches: AArch64: Add initial support - p/fuel: classes: AArch64: virtio-pci-net sync - p/reclass-system-salt-model: Add Armband repos - mcp/config: AArch64: Use UEFI arm64 image Also, allow removal of VMs booted via guest UEFI (OVMF or AAVMF). While at it, bump default vCPU number from 2 to 6. - lib.sh: AArch64: Use VGA video mode for guests On AArch64, there is no Cirrus video, so use VGA mode instead. For now, we install vgabios package no matter the arch, although it is only used on AArch64. On Debian systems, also fix a missing link for vgabios-stdvga.bin. Based on previous Armband work from [1]. - lib.sh: AArch64: virt-install: Use virtio-net-pci AArch64 virt tools (i.e. libvirt) default to "virtio-mmio", instead of "virtio-net-pci", at least before libvirt 3.x (see [2]). Without PCI bus info, we can't really enforce a specific order for the guest ethernet devices. Moreover, predictable network interface naming is out of the question with virtio-mmio, as there is no bus information to rely on. Therefore we will enforce "virtio-net-pci" on AArch64, instead of the default "virtio" (which translates into "virtio-mmio" currently). - salt.sh, user-data: Add Saltstack arm64 repo - salt.sh: Clone armband repo, apply patches from it - classes: virtual: AArch64: virtio-pci-net sync Since AArch64 will be using virtio-net-pci NIC model for guests, predictable interface naming yields a slightly different scheme. Update all configuration to reflect this. FIXME: - Use https for fetching Armband GPG keys! - Revise the patching mechanism, make things more dynamic. [1] https://github.com/opnfv/armband/blob/danube.2.0/patches/fuel-library/ arm64-bug-fixes/0002-Install-vgabios-and-link-for-aarch64.patch [2] https://www.redhat.com/archives/libvir-list/2016-August/msg00931.html Change-Id: If5aae22066f75732652201a78357c4931438d58d Signed-off-by: Guillermo Herrero Signed-off-by: Charalampos Kominos Signed-off-by: Alexandru Avadanii --- ...-Clone-armband-repo-apply-patches-from-it.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch (limited to 'patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch') diff --git a/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch b/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch new file mode 100644 index 00000000..6a25af97 --- /dev/null +++ b/patches/opnfv-fuel/0005-salt.sh-Clone-armband-repo-apply-patches-from-it.patch @@ -0,0 +1,32 @@ +From: Alexandru Avadanii +Date: Tue, 11 Jul 2017 19:43:39 +0200 +Subject: [PATCH] salt.sh: Clone armband repo, apply patches from it + +FIXME: Revise the patching mechanism, make things more dynamic. + +Signed-off-by: Alexandru Avadanii +--- + mcp/scripts/salt.sh | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh +index bb4f6cc..8bd3592 100755 +--- a/mcp/scripts/salt.sh ++++ b/mcp/scripts/salt.sh +@@ -15,6 +15,16 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END + + svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts + git clone --depth=1 --recurse-submodules https://git.opnfv.org/fuel ++ # NOTE(armband): no depth speedup on http ++ git clone http://git.opnfv.org/armband ++ ++ # For patch applying purposes (workaround for empty git config) ++ export GIT_COMMITTER_NAME="OPNFV Armband" ++ export GIT_COMMITTER_EMAIL="armband@enea.com" ++ git -C /root/fuel am -3 --patch-format=mbox \ ++ /root/armband/patches/opnfv-fuel/*.patch ++ git -C /root/fuel/mcp/reclass/classes/system am -3 --patch-format=mbox \ ++ /root/armband/patches/reclass-system-salt-model/*.patch + ln -s /root/fuel/mcp/reclass /srv/salt/reclass + + cd /srv/salt/scripts -- cgit 1.2.3-korg