From 619773c3be56822439e26c828bbdb3f173b03cff Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Sun, 12 Jun 2016 00:40:40 -0500 Subject: [PATCH] modfied to fix it for onos. Change-Id: I70249ba7df9d681b7ee1cf2ad9f1721143973a9e Signed-off-by: Narinder Gupta --- ci/02-maasdeploy.sh | 4 ++-- ci/deploy.py | 4 ++-- ci/openstack.sh | 2 +- labconfig/intel/pod5/labconfig.yaml | 15 +++++++++++++++ labconfig/intel/pod6/labconfig.yaml | 15 +++++++++++++++ 5 files changed, 35 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 diff --git a/labconfig/intel/pod5/labconfig.yaml b/labconfig/intel/pod5/labconfig.yaml index e7f8c0d0..ebd1b17f 100644 --- a/labconfig/intel/pod5/labconfig.yaml +++ b/labconfig/intel/pod5/labconfig.yaml @@ -13,6 +13,9 @@ lab: - ifname: eth4 spaces: [data] mac: ["90:E2:BA:85:4E:2C"] + - ifname: eth5 + spaces: [public] + mac: ["90:E2:BA:85:4E:2D"] power: type: ipmi address: 10.2.117.81 @@ -28,6 +31,9 @@ lab: - ifname: eth4 spaces: [data] mac: ["90:E2:BA:84:08:B8"] + - ifname: eth5 + spaces: [public] + mac: ["90:E2:BA:84:08:B9"] power: type: ipmi address: 10.2.117.82 @@ -43,6 +49,9 @@ lab: - ifname: eth4 spaces: [data] mac: ["90:E2:BA:84:07:0D"] + - ifname: eth5 + spaces: [public] + mac: ["90:E2:BA:84:07:0E"] power: type: ipmi address: 10.2.117.83 @@ -58,6 +67,9 @@ lab: - ifname: eth4 spaces: [data] mac: ["90:E2:BA:83:FD:80"] + - ifname: eth5 + spaces: [public] + mac: ["90:E2:BA:83:FD:81"] power: type: ipmi address: 10.2.117.84 @@ -73,6 +85,9 @@ lab: - ifname: eth4 spaces: [data] mac: ["90:E2:BA:75:22:74"] + - ifname: eth5 + spaces: [public] + mac: ["90:E2:BA:75:22:75"] power: type: ipmi address: 10.2.117.85 diff --git a/labconfig/intel/pod6/labconfig.yaml b/labconfig/intel/pod6/labconfig.yaml index f3ff6db0..e342d439 100644 --- a/labconfig/intel/pod6/labconfig.yaml +++ b/labconfig/intel/pod6/labconfig.yaml @@ -13,6 +13,9 @@ lab: - ifname: eth4 spaces: [data] mac: ["90:E2:BA:83:FD:20"] + - ifname: eth5 + spaces: [public] + mac: ["90:E2:BA:83:FD:21"] power: type: ipmi address: 10.2.117.96 @@ -28,6 +31,9 @@ lab: - ifname: eth4 spaces: [data] mac: ["90:E2:BA:75:30:F4"] + - ifname: eth5 + spaces: [public] + mac: ["90:E2:BA:75:30:F5"] power: type: ipmi address: 10.2.117.97 @@ -43,6 +49,9 @@ lab: - ifname: eth4 spaces: [data] mac: ["90:E2:BA:83:FE:74"] + - ifname: eth5 + spaces: [public] + mac: ["90:E2:BA:83:FE:75"] power: type: ipmi address: 10.2.117.98 @@ -58,6 +67,9 @@ lab: - ifname: eth4 spaces: [data] mac: ["90:E2:BA:84:15:7C"] + - ifname: eth5 + spaces: [public] + mac: ["90:E2:BA:84:15:7D"] power: type: ipmi address: 10.2.117.99 @@ -73,6 +85,9 @@ lab: - ifname: eth4 spaces: [data] mac: ["90:E2:BA:84:08:F4"] + - ifname: eth5 + spaces: [public] + mac: ["90:E2:BA:84:08:F5"] power: type: ipmi address: 10.2.117.100 -- 2.16.6