summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-05-12 15:30:27 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2017-05-12 15:31:03 -0500
commitd68d9914be7b1334bb530a7a860a0f2019d8759b (patch)
tree3410fbdac4a07c7a0a195d117048d55469c1719e
parentd0a15122af70dfa6804b3ab08bbeaf303bdde8de (diff)
fix for virshurl in case of bootstrap.
Change-Id: I10af2cbc02c27ac906897c5241f296413dc41ae3 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rwxr-xr-xci/03-maasdeploy.sh4
1 files changed, 2 insertions, 2 deletions
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