cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject [16/44] git commit: updated refs/heads/vpc-toolkit-hugo to 1ad1883
Date Mon, 14 Jul 2014 13:37:20 GMT
CLOUDSTACK-7010: Add domain to createZones in marvin


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

Branch: refs/heads/vpc-toolkit-hugo
Commit: 63ba1ddfb9ddfb47c7e0c564fea3ad8edf2bd19a
Parents: a9b3ab0
Author: John Dilley <john.dilley@citrix.com>
Authored: Mon Jun 30 14:23:50 2014 +0000
Committer: Santhosh Edukulla <santhosh.edukulla@gmail.com>
Committed: Tue Jul 8 22:28:56 2014 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/configGenerator.py  | 1 +
 tools/marvin/marvin/deployDataCenter.py | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63ba1ddf/tools/marvin/marvin/configGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py
index 8daaaa9..6055f46 100644
--- a/tools/marvin/marvin/configGenerator.py
+++ b/tools/marvin/marvin/configGenerator.py
@@ -88,6 +88,7 @@ class zone(object):
         self.pods = []
         self.secondaryStorages = []
         self.cacheStorages = []
+        self.domain = None
 
 
 class trafficType(object):

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63ba1ddf/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index a2fbd4a..ae48839 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -695,6 +695,7 @@ class DeployDataCenters(object):
                 zonecmd.securitygroupenabled = zone.securitygroupenabled
                 zonecmd.localstorageenabled = zone.localstorageenabled
                 zonecmd.networktype = zone.networktype
+                zonecmd.domain = zone.domain
                 if zone.securitygroupenabled != "true":
                     zonecmd.guestcidraddress = zone.guestcidraddress
                 zoneId = self.createZone(zonecmd)


Mime
View raw message