diff options
author | 2017-07-10 17:32:57 +0200 | |
---|---|---|
committer | 2017-07-11 19:51:24 +0200 | |
commit | de0b0f160f6ac408c2ba302507ede4d0a537b73f (patch) | |
tree | c9ea030e00a631ec07ef2d4f8d956a2bbad93eed /patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch | |
parent | 7ce3a621f2156110f5434e95a46e6aa6aa1fb9a1 (diff) |
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 <Guillermo.Herrero@enea.com>
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch')
-rw-r--r-- | patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch b/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch new file mode 100644 index 00000000..909b1705 --- /dev/null +++ b/patches/opnfv-fuel/0004-salt.sh-user-data-Add-Saltstack-arm64-repo.patch @@ -0,0 +1,45 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 11 Jul 2017 18:57:57 +0200 +Subject: [PATCH] salt.sh, user-data: Add Saltstack arm64 repo + +FIXME: Use https for fetching GPG repo key. + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + mcp/scripts/salt.sh | 4 ++++ + mcp/scripts/user-data.template | 9 +++++++-- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh +index c876450..bb4f6cc 100755 +--- a/mcp/scripts/salt.sh ++++ b/mcp/scripts/salt.sh +@@ -18,6 +18,10 @@ ssh ${SSH_OPTS} ubuntu@${SALT_MASTER} bash -s << SALT_INSTALL_END + ln -s /root/fuel/mcp/reclass /srv/salt/reclass + + cd /srv/salt/scripts ++ if [ "\$(uname -i)" = "aarch64" ]; then ++ # NOTE(armband): On AArch64, skip creating apt source list definitions (-r) ++ export BOOTSTRAP_SALTSTACK_OPTS=" -r -dX stable 2016.3 " ++ fi + MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} DISTRIB_REVISION=nightly ./salt-master-init.sh + salt-key -Ay + +diff --git a/mcp/scripts/user-data.template b/mcp/scripts/user-data.template +index 811a58c..03ce35e 100644 +--- a/mcp/scripts/user-data.template ++++ b/mcp/scripts/user-data.template +@@ -1,6 +1,11 @@ + #!/bin/bash +-wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add - +-echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/salt.list ++if [ "$(uname -i)" = "aarch64" ]; then ++ wget -O - http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add - ++ echo "deb http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/latest xenial main" > /etc/apt/sources.list.d/salt.list ++else ++ wget -O - https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub | sudo apt-key add - ++ echo "deb http://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest xenial main" > /etc/apt/sources.list.d/salt.list ++fi + apt update + apt-get install -y salt-minion + rm /etc/salt/minion_id |