X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functions.sh;h=c4690ef557b5035abaaa85fe9a8f62855f2a2ba0;hb=247f31321890180dca6f2300b7b065c70a0b7132;hp=73f3d2705dc6f813fdc9c85773e36ec42434929c;hpb=446636ba4edea0d3842d32e6854b3ab16c446410;p=kuberef.git diff --git a/functions.sh b/functions.sh index 73f3d27..c4690ef 100755 --- a/functions.sh +++ b/functions.sh @@ -160,6 +160,12 @@ copy_files_jump() { # Host Provisioning provision_hosts_baremetal() { + if [ "${DEBUG:-false}" == "true" ]; then + DEBUG_FLAG="-v" + else + DEBUG_FLAG="" + fi + # shellcheck disable=SC2087 ssh -o StrictHostKeyChecking=no -tT "$USERNAME"@"$(get_vm_ip)" << EOF # Install and run cloud-infra @@ -170,24 +176,29 @@ fi cp "${PROJECT_ROOT}"/"${VENDOR}"/{pdf.yaml,idf.yaml} \ "${PROJECT_ROOT}"/engine/engine cd "${PROJECT_ROOT}"/engine/engine || return -./deploy.sh -s ironic -d "${DISTRO}" \ +./deploy.sh -s ironic "${DEBUG_FLAG}" -d "${DISTRO}" \ -p file:///"${PROJECT_ROOT}"/engine/engine/pdf.yaml \ -i file:///"${PROJECT_ROOT}"/engine/engine/idf.yaml EOF } provision_hosts_vms() { + if [ "${DEBUG:-false}" == "true" ]; then + DEBUG_FLAG="-v" + else + DEBUG_FLAG="" + fi + # shellcheck disable=SC2087 -# Install and run cloud-infra -if [ ! -d "$CURRENTPATH/engine" ]; then - git clone https://gerrit.nordix.org/infra/engine.git "${CURRENTPATH}"/engine -fi -cp "$CURRENTPATH"/hw_config/"$VENDOR"/{pdf.yaml,idf.yaml} \ -"${CURRENTPATH}"/engine/engine -cd "$CURRENTPATH"/engine/engine || return -./deploy.sh -s ironic \ --p file:///"${CURRENTPATH}"/engine/engine/pdf.yaml \ --i file:///"${CURRENTPATH}"/engine/engine/idf.yaml + # Install and run cloud-infra + if [ ! -d "${CURRENTPATH}/engine" ]; then + git clone https://gerrit.nordix.org/infra/engine.git "${CURRENTPATH}"/engine + fi + cp "${CURRENTPATH}"/hw_config/"${VENDOR}"/{pdf.yaml,idf.yaml} "${CURRENTPATH}"/engine/engine + cd "${CURRENTPATH}"/engine/engine || return + ./deploy.sh -s ironic "${DEBUG_FLAG}" \ + -p file:///"${CURRENTPATH}"/engine/engine/pdf.yaml \ + -i file:///"${CURRENTPATH}"/engine/engine/idf.yaml } # Setup networking on provisioned hosts (Adapt setup_network.sh according to your network setup) @@ -328,7 +339,7 @@ EOF # Creates a python virtual environment creates_virtualenv() { if [ ! -d "$CURRENTPATH/.venv" ]; then - virtualenv .venv + virtualenv "$CURRENTPATH/.venv" fi # shellcheck disable=SC1090 source "$CURRENTPATH/.venv/bin/activate"