X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fscripts%2Fglobals.sh;h=29506dc8f69ba552980422ff9810bd8b397c7417;hb=59269ee00c235324efd35ce9966e5ff38b9cea47;hp=40b669b60018f5ef1bc27d85d543c3711bbccd7c;hpb=c85e28ea54c73e66b264adc11c38ba638397984e;p=fuel.git diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh index 40b669b60..29506dc8f 100644 --- a/mcp/scripts/globals.sh +++ b/mcp/scripts/globals.sh @@ -12,7 +12,7 @@ export CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x export SSH_KEY=${SSH_KEY:-"/var/lib/opnfv/mcp.rsa"} export SALT_MASTER=${INSTALLER_IP:-10.20.0.2} export SALT_MASTER_USER=${SALT_MASTER_USER:-ubuntu} -export VIRSH=${VIRSH:-'virsh -c qemu:///system'} +export VIRSH=${VIRSH:-'virsh --connect qemu:///system'} # Derived from INSTALLER_IP export MCPCONTROL_NET=${MCPCONTROL_NET:-${SALT_MASTER%.*}.0} @@ -37,7 +37,7 @@ function notify() { function notify_i() { tput setaf "${2:-1}" || true echo -en "${1:-"[WARN] Unsupported opt arg: $3\\n"}" - tput sgr0 + tput sgr0 || true } # same as `notify` + extra '\n' before and after;