From 55801f7e269b443144bcb1e0b7ef5a8825ac1d23 Mon Sep 17 00:00:00 2001 From: SrikanteswaraRao Talluri Date: Sun, 8 Feb 2015 11:40:27 +0530 Subject: [PATCH] CLOUDSTACK-8229: add zone wide primary storage support in deployDataCenter --- tools/marvin/marvin/deployDataCenter.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index 5716de3861f..d705330b846 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -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