Updated Branches: refs/heads/4.2 8816d41d3 -> 9bc105f39
vmware - not reqiured to add host, host will be added as part of cluster Signed-off-by: Prasanna Santhanam <[email protected]> (cherry picked from commit b3e2871e7375e9f14022bdc0e59676a6936f5e16) Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9bc105f3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9bc105f3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9bc105f3 Branch: refs/heads/4.2 Commit: 9bc105f39ab598afe6fb24588c7774dc54839963 Parents: 8816d41 Author: rayeesn <[email protected]> Authored: Thu Jul 11 10:06:34 2013 -0700 Committer: Prasanna Santhanam <[email protected]> Committed: Fri Jul 12 16:11:55 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/deployDataCenter.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9bc105f3/tools/marvin/marvin/deployDataCenter.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index ac96d09..20908ca 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -84,8 +84,9 @@ specify a valid config file" % cfgFile) clusterresponse = self.apiClient.addCluster(clustercmd) clusterId = clusterresponse[0].id - self.addHosts(cluster.hosts, zoneId, podId, clusterId, - cluster.hypervisor) + if cluster.hypervisor.lower() != "vmware": + self.addHosts(cluster.hosts, zoneId, podId, clusterId, + cluster.hypervisor) self.createPrimaryStorages(cluster.primaryStorages, zoneId, podId, clusterId)
