diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-06 19:06:15 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-06 19:12:04 +0200 |
| commit | 56667c6c04fd2f11e8ac5b2637a837d91cf5b884 (patch) | |
| tree | 5eb2c8deb792430c93533c20097a7a0b88e6928e /patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch | |
| parent | 45bc407e1d6986bc6757f210919c03f07184982f (diff) | |
p/fuel: Rebase after non-root deploys got upstream
While at it, refresh "AArch64 virtio NIC names sync" to include
changes for ODL-L3 scenario recently added in Fuel@OPNFV.
Change-Id: Ic221b330d9968204b7d4da16a26454b2cf8b88eb
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch')
| -rw-r--r-- | patches/opnfv-fuel/0002-lib.sh-AArch64-Use-VGA-video-mode-for-guests.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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 04337f29..7be7e52a 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 @@ -19,22 +19,22 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh -index a77dd0f..aec8048 100755 +index 7b3bf54..491b955 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh -@@ -270,9 +270,10 @@ pushd "${DEPLOY_DIR}" > /dev/null +@@ -279,9 +279,10 @@ pushd "${DEPLOY_DIR}" > /dev/null # Install required packages - [ -n "$(command -v apt-get)" ] && apt-get install -y \ + [ -n "$(command -v apt-get)" ] && sudo apt-get install -y \ - git make rsync mkisofs curl virtinst cpu-checker qemu-kvm + git make rsync mkisofs curl virtinst cpu-checker qemu-kvm vgabios && \ -+ ln -sf /usr/share/vgabios/vgabios.bin /usr/share/qemu/vgabios-stdvga.bin - [ -n "$(command -v yum)" ] && yum install -y \ ++ sudo ln -sf /usr/share/vgabios/vgabios.bin /usr/share/qemu/vgabios-stdvga.bin + [ -n "$(command -v yum)" ] && sudo yum install -y \ - git make rsync genisoimage curl virt-install qemu-kvm + git make rsync genisoimage curl virt-install qemu-kvm vgabios # Check scenario file existence - if [[ ! -f ../config/${DEPLOY_SCENARIO}.yaml ]]; then + if [[ ! -f ../config/scenario/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml ]]; then diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index 33dba3c..8d45100 100644 --- a/mcp/scripts/lib.sh |