summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
Diffstat (limited to 'ci')
-rwxr-xr-xci/02-maasdeploy.sh4
-rw-r--r--ci/deploy.py4
-rwxr-xr-xci/openstack.sh2
3 files changed, 5 insertions, 5 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 7214719d..62e57da5 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -269,7 +269,7 @@ enable_if(){
i="0"
while [ ! -z "${EXTNET[i]}" ];
do
- echo enableautomode ${EXTNET[i]} AUTO $stornet || true
+ enableautomode ${EXTNET[i]} AUTO $stornet || true
i=$[$i+1]
done
fi
@@ -278,7 +278,7 @@ enable_if(){
i="0"
while [ ! -z "${EXTNET[i]}" ];
do
- echo enableautomode ${EXTNET[i]} AUTO $pubnet || true
+ enableautomode ${EXTNET[i]} AUTO $pubnet || true
i=$[$i+1]
done
fi
diff --git a/ci/deploy.py b/ci/deploy.py
index e3d3cddd..99dce0df 100644
--- a/ci/deploy.py
+++ b/ci/deploy.py
@@ -88,7 +88,7 @@ while c < len(labcfg["opnfv"]["spaces"]):
brgway = getFromDict(labcfg, ["opnfv","spaces",c,"gateway"])
tmpcidr = brcidr[:-4]
opnfvlabcfg["opnfv"]["admNetwork"]=tmpcidr+"2"
- opnfvlabcfg["opnfv"]["admNetworkgway"]=brgway
+ opnfvlabcfg["opnfv"]["admNetgway"]=brgway
nodegroup={"device": "eth"+str(y), "ip": tmpcidr+"5","subnet_mask": "255.255.255.0", \
"broadcast_ip": tmpcidr+"255", "router_ip": brgway,\
@@ -133,7 +133,7 @@ while c < len(labcfg["opnfv"]["spaces"]):
y=y+1
if brtype == "public":
opnfvcfg["demo-maas"]["juju-bootstrap"]["interfaces"].append("bridge="+brname+",model=virtio")
- opnfvlabcfg["opnfv"]["pubicNetwork"]=brcidr
+ opnfvlabcfg["opnfv"]["publicNetwork"]=brcidr
if brtype == "external":
ipaddress = getFromDict(labcfg, ["opnfv","spaces",c,"ipaddress"])
ethbrAdm = (ethbrAdm+'\n'
diff --git a/ci/openstack.sh b/ci/openstack.sh
index ed32f997..1e82ff9b 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -19,7 +19,7 @@ if [ -f ./deployconfig.yaml ];then
EXTNET_GW=${EXTNET[2]}
EXTNET_NET=${EXTNET[3]}
EXTNET_PORT=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '`
- ADMNET_GW=`grep "admNetworkgway" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '`
+ ADMNET_GW=`grep "admNetgway" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '`
fi