X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fscripts%2Fglobals.sh;h=29506dc8f69ba552980422ff9810bd8b397c7417;hb=c2ea7deba73e335ace30eba1db7e2f80d3c1daed;hp=8966a0a946e88201fe43ee5243937d6e769df37c;hpb=058c64ae668191ca8223afa581c7b3214b52fe4a;p=fuel.git

diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh
index 8966a0a94..29506dc8f 100644
--- a/mcp/scripts/globals.sh
+++ b/mcp/scripts/globals.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 ##############################################################################
-# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others.
+# Copyright (c) 2018 Ericsson AB, Mirantis Inc., Enea AB and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
@@ -12,6 +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 --connect qemu:///system'}
 
 # Derived from INSTALLER_IP
 export MCPCONTROL_NET=${MCPCONTROL_NET:-${SALT_MASTER%.*}.0}
@@ -25,22 +26,27 @@ export SSH_SALT="${SALT_MASTER_USER}@${SALT_MASTER}"
 ##############################################################################
 # BEGIN of colored notification wrappers
 #
+
+# same as `notify_i` + trailing '\n';
 function notify() {
     local msg=${1}; shift
     notify_i "${msg}\n" "$@"
 }
 
+# Inline (no newline added) colored output notification wrapper
 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;
 function notify_n() {
     local msg=${1}; shift
     notify_i "\n${msg}\n\n" "$@"
 }
 
+# same as `notify` + stderr output + exit;
 function notify_e() {
     local msg=${1}; shift
     notify_i "\n${msg}\n\n" "$@" 1>&2