cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to e703028
Date Sat, 12 Dec 2015 20:02:25 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master bdaa60fd6 -> e7030285a


CLOUDSTACK-9139 make zwps default when defined on zone level


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

Branch: refs/heads/master
Commit: 9b89dfd6438b8a669617c64c82198c92443a29d8
Parents: 312b9af
Author: Daan Hoogland <daan@onecht.net>
Authored: Fri Dec 11 11:37:42 2015 +0100
Committer: Daan Hoogland <daan@onecht.net>
Committed: Fri Dec 11 13:23:14 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b89dfd6/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index 3dd5667..91b30a6 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -243,8 +243,8 @@ class DeployDataCenters(object):
 
                 primarycmd.tags = primary.tags
                 primarycmd.url = primary.url
-                if primary.scope == 'zone':
-                    primarycmd.scope = primary.scope
+                if primary.scope == 'zone' or clusterId is None:
+                    primarycmd.scope = 'zone'
                     primarycmd.hypervisor = primary.hypervisor
                 else:
                     primarycmd.podid = podId


Mime
View raw message