cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [1/2] git commit: updated refs/heads/4.2 to 96e1c54
Date Wed, 03 Jul 2013 21:34:05 GMT
Updated Branches:
  refs/heads/4.2 fdb85998e -> 96e1c54cb


fix marvin when deploy vmware setup


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/19651ff5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/19651ff5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/19651ff5

Branch: refs/heads/4.2
Commit: 19651ff5fdd4cfc0f4d40ebd70e21dbe366f769e
Parents: fdb8599
Author: Edison Su <sudison@gmail.com>
Authored: Tue Jul 2 11:13:11 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Wed Jul 3 14:33:17 2013 -0700

----------------------------------------------------------------------
 tools/marvin/marvin/deployDataCenter.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/19651ff5/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index d704375..ac96d09 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -67,7 +67,8 @@ specify a valid config file" % cfgFile)
         if clusters is None:
             return
 
-        if vmwareDc:
+        if vmwareDc is not None:
+            vmwareDc.zoneid = zoneId
             self.addVmWareDataCenter(vmwareDc)
 
         for cluster in clusters:


Mime
View raw message