diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-13 15:39:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-13 15:39:47 +0000 |
| commit | 22bbef86f71a099940e366f11afce777cb0d113c (patch) | |
| tree | a135f55d9d9f628eafdc721102fdfd9b68f215ef /ci | |
| parent | 40f907255380dbfc4d808d9f3c768db80c4c8158 (diff) | |
| parent | 8bdc7b442ebd9f162a36f568d9b61ecf85ab23cb (diff) | |
Merge "deploy.sh: Check hypervisor after prereq install"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 5c2fec7bb..f4d334896 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -236,11 +236,6 @@ if [[ "$(sudo whoami)" != 'root' ]]; then exit 1 fi -if ! virsh list >/dev/null 2>&1; then - notify "[ERROR] This script requires hypervisor access\n" 1>&2 - exit 1 -fi - # Validate mandatory arguments are set if [ -z "${TARGET_LAB}" ] || [ -z "${TARGET_POD}" ] || \ [ -z "${DEPLOY_SCENARIO}" ]; then @@ -265,9 +260,11 @@ pushd "${DEPLOY_DIR}" > /dev/null # Install required packages [ -n "$(command -v apt-get)" ] && sudo apt-get install -y \ - git make rsync mkisofs curl virtinst cpu-checker qemu-kvm uuid-runtime + git make rsync mkisofs curl virtinst cpu-checker qemu-kvm uuid-runtime \ + libvirt-bin [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \ - git make rsync genisoimage curl virt-install qemu-kvm util-linux + git make rsync genisoimage curl virt-install qemu-kvm util-linux \ + libvirt # For baremetal, python is indirectly required for PDF parsing if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then @@ -277,6 +274,11 @@ if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then python python-ipaddress python-jinja2 python-yaml fi +if ! virsh list >/dev/null 2>&1; then + notify "[ERROR] This script requires hypervisor access\n" 1>&2 + exit 1 +fi + # Clone git submodules and apply our patches make -C "${REPO_ROOT_PATH}/mcp/patches" deepclean patches-import |