From ca424fd93cbba012a7dee84db1d6fea112952ef9 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 2 Jun 2016 10:02:10 -0500 Subject: modified the disk Change-Id: I6a153b5cdb02e29650d454ca262856a4c775d6a5 Signed-off-by: Narinder Gupta --- ci/deploy.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'ci/deploy.py') diff --git a/ci/deploy.py b/ci/deploy.py index cef5d265..fffe1bdc 100644 --- a/ci/deploy.py +++ b/ci/deploy.py @@ -18,6 +18,7 @@ with open('labconfig.yaml', 'r') as labf: labcfg = yaml.load(labf) opnfvcfg={} +opnfvlabcfg={} def getFromDict(dataDict, mapList): return reduce(lambda d, k: d[k], mapList, dataDict) @@ -52,7 +53,7 @@ opnfvcfg['demo-maas']={'juju-bootstrap':{'memory': 4096,'name': "bootstrap",\ }\ } -opnfvcfg['opnfv']={'ext-port':'','floating-ip-range':'','dataNetwork':'','ceph-disk':'/srv/'} +opnfvlabcfg['opnfv']={'ext-port':'','floating-ip-range':'','dataNetwork':'','ceph-disk':'/srv/'} opnfvcfg['demo-maas']['maas']['apt_sources'].append("ppa:maas/stable") opnfvcfg['demo-maas']['maas']['apt_sources'].append("ppa:juju/stable") @@ -85,7 +86,7 @@ while c < len(labcfg["opnfv"]["spaces"]): ethbrAdmin = getFromDict(labcfg, ["opnfv","spaces",c,"bridge"]) brgway = getFromDict(labcfg, ["opnfv","spaces",c,"gateway"]) tmpcidr = brcidr[:-4] - opnfvcfg["opnfv"]["admNetwork"]=tmpcidr+"2" + opnfvlabcfg["opnfv"]["admNetwork"]=tmpcidr+"2" nodegroup={"device": "eth"+str(y), "ip": tmpcidr+"5","subnet_mask": "255.255.255.0", \ "broadcast_ip": tmpcidr+"255", "router_ip": brgway,\ @@ -139,7 +140,7 @@ while c < len(labcfg["opnfv"]["spaces"]): ' netmask 255.255.255.0\n') opnfvcfg["demo-maas"]["juju-bootstrap"]["interfaces"].append("bridge="+brname+",model=virtio") if brtype == "data": - opnfvcfg["opnfv"]["dataNetwork"]=brcidr + opnfvlabcfg["opnfv"]["dataNetwork"]=brcidr c=c+1 @@ -200,10 +201,12 @@ while c < len(labcfg["lab"]["racks"][0]["nodes"]): c=c+1 -opnfvcfg["opnfv"]["floating-ip-range"]=labcfg["lab"]["racks"][0]["floating-ip-range"] -opnfvcfg["opnfv"]["ext-port"]=labcfg["lab"]["racks"][0]["ext-port"] -opnfvcfg["opnfv"]["ceph-disk"]=labcfg["opnfv"]["storage"][0]["disk"] +opnfvlabcfg["opnfv"]["floating-ip-range"]=labcfg["lab"]["racks"][0]["floating-ip-range"] +opnfvlabcfg["opnfv"]["ext-port"]=labcfg["lab"]["racks"][0]["ext-port"] +opnfvlabcfg["opnfv"]["ceph-disk"]=labcfg["opnfv"]["storage"][0]["disk"] with open('deployment.yaml', 'wa') as opnfvf: yaml.dump(opnfvcfg, opnfvf, default_flow_style=False) +with open('deployconfig.yaml', 'wa') as opnfvf: + yaml.dump(opnfvlabcfg, opnfvf, default_flow_style=False) -- cgit 1.2.3-korg