etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-8229: add zone wide primary storage support in deployDataCenter

This commit is contained in:
SrikanteswaraRao Talluri 2015-02-08 11:40:27 +05:30
parent 2567ef2452
commit 55801f7e26
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -196,7 +196,8 @@ class DeployDataCenters(object):
self.createPrimaryStorages(cluster.primaryStorages,
zoneId,
podId,
clusterId)
clusterId,
cluster.hypervisor)
except Exception as e:
print "Exception Occurred %s" % GetDetailExceptionInfo(e)
self.__tcRunLogger.exception("====Cluster %s Creation Failed"
@ -230,7 +231,8 @@ class DeployDataCenters(object):
primaryStorages,
zoneId,
podId,
clusterId):
clusterId,
hypervisor):
try:
if primaryStorages is None:
return
@ -243,8 +245,9 @@ class DeployDataCenters(object):
primarycmd.podid = podId
primarycmd.tags = primary.tags
primarycmd.url = primary.url
if primary.scope.lower() == 'zone':
if primary.scope == 'zone':
primarycmd.scope = primary.scope
primarycmd.hypervisor = hypervisor
else:
primarycmd.clusterid = clusterId
primarycmd.zoneid = zoneId