Repository: cloudstack Updated Branches: refs/heads/master 2567ef245 -> 55801f7e2
CLOUDSTACK-8229: add zone wide primary storage support in deployDataCenter Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/55801f7e Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/55801f7e Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/55801f7e Branch: refs/heads/master Commit: 55801f7e269b443144bcb1e0b7ef5a8825ac1d23 Parents: 2567ef2 Author: SrikanteswaraRao Talluri <[email protected]> Authored: Sun Feb 8 11:40:27 2015 +0530 Committer: SrikanteswaraRao Talluri <[email protected]> Committed: Sun Feb 8 11:40:27 2015 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/deployDataCenter.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/55801f7e/tools/marvin/marvin/deployDataCenter.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index 5716de3..d705330 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
