Merge "[ha] barbican, nova targeting: use server:role"

[fuel.git] / mcp / scripts / globals.sh

diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh
index d95448d..754308f 100644 (file)
--- a/mcp/scripts/globals.sh
+++ b/mcp/scripts/globals.sh
@@ -12,10 +12,12 @@ 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}
 export MCPCONTROL_PREFIX=${MCPCONTROL_PREFIX:-24}
+export MAAS_IP=${MAAS_IP:-${SALT_MASTER%.*}.3}
 
 # Derived from above global vars, not overideable
 export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"