Fix space gateway processing from JSON

[joid.git] / ci / 03-maasdeploy.sh

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index ed9c48f..840938c 100755 (executable)
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -288,7 +288,7 @@ enablesubnetanddhcp(){
             maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
         fi
     elif [ "$space" == "public" ]; then
-        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.public | cut -d \" -f 2 `
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="public")'.gateway | cut -d \" -f 2 `
         if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
             maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
         fi
@@ -299,7 +299,7 @@ enablesubnetanddhcp(){
             maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
         fi
     elif [ "$space" == "storage" ]; then
-        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.storage | cut -d \" -f 2 `
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="storage")'.gateway | cut -d \" -f 2 `
         if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
             maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
         fi