summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-28 00:38:57 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-27 22:52:55 +0000
commit8cee0b93af5cd7a3343ecab11fe20b8ca78a5669 (patch)
tree68efd8be9be28b9f5fba418648c520bd395ce459
parenta2d33ce77ec3125c5b31ca8cdf0e0be798e671ef (diff)
[deploy] Use qemu:///system for virt-inst too
Make sure `virsh` and `virt-install` use the same connection URI. Fixes: e49ffac1 Change-Id: I437f063ce9936804248b7cf09f6ecfef6417f387 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit c034acca79007040c9e1b3e7ad22b166f6ff4d7a)
-rw-r--r--mcp/scripts/globals.sh2
-rw-r--r--mcp/scripts/lib_jump_deploy.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/mcp/scripts/globals.sh b/mcp/scripts/globals.sh
index 40b669b60..754308f09 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}
diff --git a/mcp/scripts/lib_jump_deploy.sh b/mcp/scripts/lib_jump_deploy.sh
index 3c3256aa0..634a933bc 100644
--- a/mcp/scripts/lib_jump_deploy.sh
+++ b/mcp/scripts/lib_jump_deploy.sh
@@ -360,7 +360,7 @@ function create_vms {
[ ! -e "${image_dir}/virt-manager" ] || VIRT_PREFIX="${image_dir}/virt-manager/"
# shellcheck disable=SC2086
- ${VIRT_PREFIX}virt-install --name "${vnode_data[0]}" \
+ ${VIRT_PREFIX}${VIRSH/virsh/virt-install} --name "${vnode_data[0]}" \
${virt_cpu_args} --accelerate \
${net_args} \
--ram "${vnode_data[1]}" \