diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-26 12:02:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-26 12:02:56 +0000 |
| commit | 9857a8101115487a0e1d460ad8f774b93fef334d (patch) | |
| tree | f568e5ada1296b2bd91e1ac3a194925eb3d265cb /ci | |
| parent | dcdd8063fc45ee3795d36e7e61874a4c716b1e6d (diff) | |
| parent | e49ffac10dc059b9133586ae4991446f5a5915de (diff) | |
Merge "[lib.sh] Split into multiple files for readability"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build.sh | 1 | ||||
| -rwxr-xr-x | ci/deploy.sh | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ci/build.sh b/ci/build.sh index ec0040e7d..67b6d46d8 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -35,6 +35,7 @@ DOCKER_PUSH=${2---push} # pass an empty second arg to disable push source "${DEPLOY_DIR}/globals.sh" source "${DEPLOY_DIR}/lib.sh" +source "${DEPLOY_DIR}/lib_jump_common.sh" [ ! "${TERM:-unknown}" = 'unknown' ] || export TERM=vt220 diff --git a/ci/deploy.sh b/ci/deploy.sh index 5fb8c43a6..af60ddfef 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -150,6 +150,8 @@ MCP_CMP_SS=${MCP_CMP_SS:-0} source "${DEPLOY_DIR}/globals.sh" source "${DEPLOY_DIR}/lib.sh" source "${DEPLOY_DIR}/lib_template.sh" +source "${DEPLOY_DIR}/lib_jump_common.sh" +source "${DEPLOY_DIR}/lib_jump_deploy.sh" # # END of variables to customize @@ -256,7 +258,7 @@ else virtinst_install "${MCP_STORAGE_DIR}" fi -if ! virsh list >/dev/null 2>&1; then +if ! ${VIRSH} list >/dev/null 2>&1; then notify_e "[ERROR] This script requires hypervisor access" fi |