From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 12 May 2017 20:30:27 +0000 (-0500)
Subject: fix for virshurl in case of bootstrap.
X-Git-Tag: opnfv-5.0.RC1~122
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F34695%2F1;p=joid.git

fix for virshurl in case of bootstrap.

Change-Id: I10af2cbc02c27ac906897c5241f296413dc41ae3
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 42e5076a..8e8b9900 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -334,7 +334,7 @@ addnodes(){
     # if we have a virshurl configuration we use it, else we use local
     VIRSHURL=$(cat labconfig.json | jq -r '.opnfv.virshurl')
     if ([ $VIRSHURL == "" ] || [ "$VIRSHURL" == "null" ]); then
-        VIRSHURL="qemu:///system "
+        VIRSHURL="qemu://$USER@$MAAS_IP/system "
         VIRSHHOST=""
     else
         VIRSHHOST=$(echo $VIRSHURL| cut -d\/ -f 3 | cut -d@ -f2)
@@ -407,7 +407,7 @@ addnodes(){
             rm -f $NODE_NAME
             maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \
                 tags='control compute' hostname=$NODE_NAME power_type='virsh' mac_addresses=$nodemac \
-                power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
+                power_parameters_power_address="$VIRSHURL" \
                 architecture='amd64/generic' power_parameters_power_id=$NODE_NAME
             nodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == '\"$NODE_NAME\"').system_id')
             maas $PROFILE tag update-nodes control add=$nodeid || true