diff options
| -rwxr-xr-x | ci/03-maasdeploy.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 311abb92..d082f466 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -376,22 +376,21 @@ addnodes(){ maas $PROFILE tag update-nodes compute add=$compute2nodeid || true maas $PROFILE tag update-nodes compute add=$compute5nodeid || true else - untis=`cat deployconfig.json | jq .opnfv.units` + units=`cat deployconfig.json | jq .opnfv.units` until [ $(($units)) -lt 1 ]; do - NODE_NAME=`cat labconfig.json | jq '.lab.racks[].nodes[i].name' | cut -d \" -f 2 ` - MAC_ADDRESS=`cat labconfig.json | jq '.lab.racks[].nodes[i].nics[] | select(.spaces[]=="admin").mac'[0] | cut -d \" -f 2 ` - POWER_TYPE=`cat labconfig.json | jq '.lab.racks[].nodes[i].power.type' | cut -d \" -f 2 ` - POWER_IP=`cat labconfig.json | jq '.lab.racks[].nodes[i].power.address' | cut -d \" -f 2 ` - POWER_USER=`cat labconfig.json | jq '.lab.racks[].nodes[i].power.user' | cut -d \" -f 2 ` - POWER_PASS=`cat labconfig.json | jq '.lab.racks[].nodes[i].power.pass' | cut -d \" -f 2 ` + units=$(($units - 1)); + NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[i].name" | cut -d \" -f 2 ` + MAC_ADDRESS=`cat labconfig.json | jq ".lab.racks[].nodes[i].nics[] | select(.spaces[]==\"admin\").mac"[0] | cut -d \" -f 2 ` + POWER_TYPE=`cat labconfig.json | jq ".lab.racks[].nodes[i].power.type" | cut -d \" -f 2 ` + POWER_IP=`cat labconfig.json | jq ".lab.racks[].nodes[i].power.address" | cut -d \" -f 2 ` + POWER_USER=`cat labconfig.json | jq ".lab.racks[].nodes[i].power.user" | cut -d \" -f 2 ` + POWER_PASS=`cat labconfig.json | jq ".lab.racks[].nodes[i].power.pass" | cut -d \" -f 2 ` maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \ hostname=$NODE_NAME power_type=$POWER_TYPE power_parameters_power_address=$POWER_IP \ power_parameters_power_user=$POWER_USER power_parameters_power_pass=$POWER_PASS mac_addresses=$MAC_ADDRESS \ architecture='amd64/generic' - - units=$(($units - 1)); done fi |