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/0005-deploy-Allow-non-root-deploys.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/0005-deploy-Allow-non-root-deploys.patch')
| -rw-r--r-- | patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch b/patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch deleted file mode 100644 index 1d86a17c..00000000 --- a/patches/opnfv-fuel/0005-deploy-Allow-non-root-deploys.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Mon, 17 Jul 2017 23:10:25 +0000 -Subject: [PATCH] deploy: Allow non-root deploys - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - ci/deploy.sh | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/ci/deploy.sh b/ci/deploy.sh -index aec8048..d676b76 100755 ---- a/ci/deploy.sh -+++ b/ci/deploy.sh -@@ -87,7 +87,7 @@ $(notify "Disabled input parameters (not yet supported with MCP):" 3) - -i (disabled) .iso image to be deployed (needs to be provided in a URI - style, it can be a local resource: file:// or a remote resource http(s)://) - --$(notify "[NOTE] Root priviledges are needed for this script to run" 3) -+$(notify "[NOTE] sudo priviledges are needed for this script to run" 3) - - Example: - -@@ -240,8 +240,8 @@ do - esac - done - --if [[ $EUID -ne 0 ]]; then -- notify "[ERROR] This script must be run as root\n" 1>&2 -+if [[ "$(sudo whoami)" != 'root' ]]; then -+ notify "This script requires sudo rights\n" 1>&2 - exit 1 - fi - -@@ -269,10 +269,10 @@ pushd "${DEPLOY_DIR}" > /dev/null - # scenario, etc. - - # 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 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 vgabios - - # Check scenario file existence |