summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-15 16:52:30 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-15 16:52:30 +0000
commit07d7e4c43e082fdfae24779ceaee800fb8feeec4 (patch)
tree998a345c33b1489bf92a18caf89d34f1e95df41d
parent12c1749e6bd339dc23f155d6990e30f54245c88d (diff)
parent8fbe4650d66e18eadd946186584a10a95e2cce4e (diff)
Merge "deploy.sh: Check hypervisor after prereq install" into stable/euphrates
-rwxr-xr-xci/deploy.sh16
-rw-r--r--docs/release/installation/installation.instruction.rst5
2 files changed, 14 insertions, 7 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 6a1d6e1e6..06606414e 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
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
diff --git a/docs/release/installation/installation.instruction.rst b/docs/release/installation/installation.instruction.rst
index e2d2be657..652c85558 100644
--- a/docs/release/installation/installation.instruction.rst
+++ b/docs/release/installation/installation.instruction.rst
@@ -191,6 +191,11 @@ installed on the Jumpserver:
- CentOS 7 (recommended by Pharos specification);
- Ubuntu Xenial;
+**NOTE:** The install script expects 'libvirt' to be installed and running
+on the Jumpserver. In case the packages are missing, the script will install
+them; but depending on the OS distribution, the user might have to start the
+'libvirtd' service manually.
+
==========================================
OPNFV Software Installation and Deployment
==========================================