diff options
author | Martin Kulhavy <martin.kulhavy@nokia.com> | 2017-07-11 10:24:51 +0300 |
---|---|---|
committer | Martin Kulhavy <martin.kulhavy@nokia.com> | 2017-07-11 10:26:01 +0300 |
commit | 43c42ad2d879936707816a269d8e3f8fda2b198f (patch) | |
tree | 8313bebe8349dcaf834254599903ccdfee090bb9 | |
parent | 9cc0c2ebef9694dc75a7ba9b811ba37a1746a8dd (diff) |
Fix space gateway processing from JSONdanube.3.0stable/danube
The gateway addresses for public and storage spaces were collected from
wrong values.
Change-Id: I94234b9c3d3493d9e1eda5b8a0333064f3f0bb73
Signed-off-by: Martin Kulhavy <martin.kulhavy@nokia.com>
-rwxr-xr-x | ci/03-maasdeploy.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index ed9c48fe..840938c7 100755 --- 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 |