apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

elasticIp added as virtual network in basic zone

Browse Source
This commit is contained in:
Prasanna Santhanam 2012-09-06 17:35:57 +05:30
parent 3eb75b57af
commit 02d33344bd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/marvin/marvin/deployDataCenter.py
View File

@ -109,7 +109,7 @@ class deployDataCenters():
self.createClusters(pod.clusters, zoneId, podId) self.createClusters(pod.clusters, zoneId, podId)
def createVlanIpRanges(self, mode, ipranges, zoneId, podId=None,\ def createVlanIpRanges(self, mode, ipranges, zoneId, podId=None,\
networkId=None): networkId=None, forvirtualnetwork=None):
if ipranges is None: if ipranges is None:
return return
for iprange in ipranges: for iprange in ipranges:
@ -125,6 +125,9 @@ class deployDataCenters():
vlanipcmd.zoneid = zoneId vlanipcmd.zoneid = zoneId
vlanipcmd.vlan = iprange.vlan vlanipcmd.vlan = iprange.vlan
if mode == "Basic": if mode == "Basic":
if forvirtualnetwork:
vlanipcmd.forvirtualnetwork = "true"
else:
vlanipcmd.forvirtualnetwork = "false" vlanipcmd.forvirtualnetwork = "false"
else: else:
vlanipcmd.forvirtualnetwork = "true" vlanipcmd.forvirtualnetwork = "true"
@ -309,7 +312,7 @@ class deployDataCenters():
self.createpods(zone.pods, zoneId, networkid) self.createpods(zone.pods, zoneId, networkid)
if self.isEipElbZone(zone): if self.isEipElbZone(zone):
self.createVlanIpRanges(zone.networktype, zone.ipranges, \ self.createVlanIpRanges(zone.networktype, zone.ipranges, \
zoneId) zoneId, forvirtualnetwork=True)
if zone.networktype == "Advanced": if zone.networktype == "Advanced":
self.createpods(zone.pods, zoneId) self.createpods(zone.pods, zoneId)